Merge branch 'master' into e2e
# Conflicts: # Pipfile.lock # docs/installation/docker-compose.md
This commit is contained in:
2
.github/FUNDING.yml
vendored
2
.github/FUNDING.yml
vendored
@ -1 +1 @@
|
||||
custom: ["https://www.paypal.me/octocat"]
|
||||
custom: ["https://www.paypal.me/beryju"]
|
||||
|
BIN
.github/screen_admin.png
vendored
BIN
.github/screen_admin.png
vendored
Binary file not shown.
Before Width: | Height: | Size: 175 KiB |
BIN
.github/screen_apps.png
vendored
BIN
.github/screen_apps.png
vendored
Binary file not shown.
Before Width: | Height: | Size: 160 KiB |
38
.github/workflows/ci-cleanup.yml
vendored
38
.github/workflows/ci-cleanup.yml
vendored
@ -1,38 +0,0 @@
|
||||
name: passbook-ci-cleanup
|
||||
on:
|
||||
- delete
|
||||
|
||||
jobs:
|
||||
delete-server:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Delete docker tag
|
||||
env:
|
||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
run: curl
|
||||
-u $DOCKER_USERNAME:$DOCKER_PASSWORD
|
||||
-X "DELETE"
|
||||
"https://hub.docker.com/v2/repositories/$DOCKER_USERNAME/passbook/tags/${GITHUB_REF##*/}/"
|
||||
delete-gatekeeper:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Delete docker tag
|
||||
env:
|
||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
run: curl
|
||||
-u $DOCKER_USERNAME:$DOCKER_PASSWORD
|
||||
-X "DELETE"
|
||||
"https://hub.docker.com/v2/repositories/$DOCKER_USERNAME/passbook-gatekeeper/tags/${GITHUB_REF##*/}/"
|
||||
delete-static:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Delete docker tag
|
||||
env:
|
||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
run: curl
|
||||
-u $DOCKER_USERNAME:$DOCKER_PASSWORD
|
||||
-X "DELETE"
|
||||
"https://hub.docker.com/v2/repositories/$DOCKER_USERNAME/passbook-static/tags/${GITHUB_REF##*/}/"
|
12
.github/workflows/ci.yml
vendored
12
.github/workflows/ci.yml
vendored
@ -163,10 +163,10 @@ jobs:
|
||||
- name: Building Docker Image
|
||||
run: docker build
|
||||
--no-cache
|
||||
-t beryju/passbook:${GITHUB_REF##*/}
|
||||
-t beryju/passbook:gh-${GITHUB_REF##*/}
|
||||
-f Dockerfile .
|
||||
- name: Push Docker Container to Registry
|
||||
run: docker push beryju/passbook:${GITHUB_REF##*/}
|
||||
run: docker push beryju/passbook:gh-${GITHUB_REF##*/}
|
||||
build-gatekeeper:
|
||||
needs:
|
||||
- migrations
|
||||
@ -184,10 +184,10 @@ jobs:
|
||||
cd gatekeeper
|
||||
docker build \
|
||||
--no-cache \
|
||||
-t beryju/passbook-gatekeeper:${GITHUB_REF##*/} \
|
||||
-t beryju/passbook-gatekeeper:gh-${GITHUB_REF##*/} \
|
||||
-f Dockerfile .
|
||||
- name: Push Docker Container to Registry
|
||||
run: docker push beryju/passbook-gatekeeper:${GITHUB_REF##*/}
|
||||
run: docker push beryju/passbook-gatekeeper:gh-${GITHUB_REF##*/}
|
||||
build-static:
|
||||
needs:
|
||||
- migrations
|
||||
@ -213,7 +213,7 @@ jobs:
|
||||
run: docker build
|
||||
--no-cache
|
||||
--network=$(docker network ls | grep github | awk '{print $1}')
|
||||
-t beryju/passbook-static:${GITHUB_REF##*/}
|
||||
-t beryju/passbook-static:gh-${GITHUB_REF##*/}
|
||||
-f static.Dockerfile .
|
||||
- name: Push Docker Container to Registry
|
||||
run: docker push beryju/passbook-static:${GITHUB_REF##*/}
|
||||
run: docker push beryju/passbook-static:gh-${GITHUB_REF##*/}
|
||||
|
12
.github/workflows/release.yml
vendored
12
.github/workflows/release.yml
vendored
@ -16,11 +16,11 @@ jobs:
|
||||
- name: Building Docker Image
|
||||
run: docker build
|
||||
--no-cache
|
||||
-t beryju/passbook:0.8.15-beta
|
||||
-t beryju/passbook:0.9.0-pre2
|
||||
-t beryju/passbook:latest
|
||||
-f Dockerfile .
|
||||
- name: Push Docker Container to Registry (versioned)
|
||||
run: docker push beryju/passbook:0.8.15-beta
|
||||
run: docker push beryju/passbook:0.9.0-pre2
|
||||
- name: Push Docker Container to Registry (latest)
|
||||
run: docker push beryju/passbook:latest
|
||||
build-gatekeeper:
|
||||
@ -37,11 +37,11 @@ jobs:
|
||||
cd gatekeeper
|
||||
docker build \
|
||||
--no-cache \
|
||||
-t beryju/passbook-gatekeeper:0.8.15-beta \
|
||||
-t beryju/passbook-gatekeeper:0.9.0-pre2 \
|
||||
-t beryju/passbook-gatekeeper:latest \
|
||||
-f Dockerfile .
|
||||
- name: Push Docker Container to Registry (versioned)
|
||||
run: docker push beryju/passbook-gatekeeper:0.8.15-beta
|
||||
run: docker push beryju/passbook-gatekeeper:0.9.0-pre2
|
||||
- name: Push Docker Container to Registry (latest)
|
||||
run: docker push beryju/passbook-gatekeeper:latest
|
||||
build-static:
|
||||
@ -66,11 +66,11 @@ jobs:
|
||||
run: docker build
|
||||
--no-cache
|
||||
--network=$(docker network ls | grep github | awk '{print $1}')
|
||||
-t beryju/passbook-static:0.8.15-beta
|
||||
-t beryju/passbook-static:0.9.0-pre2
|
||||
-t beryju/passbook-static:latest
|
||||
-f static.Dockerfile .
|
||||
- name: Push Docker Container to Registry (versioned)
|
||||
run: docker push beryju/passbook-static:0.8.15-beta
|
||||
run: docker push beryju/passbook-static:0.9.0-pre2
|
||||
- name: Push Docker Container to Registry (latest)
|
||||
run: docker push beryju/passbook-static:latest
|
||||
test-release:
|
||||
|
Reference in New Issue
Block a user