staging into master #426

Merged
edraft merged 83 commits from staging into master 2023-11-06 20:06:34 +01:00
6 changed files with 18 additions and 1 deletions
Showing only changes of commit 14d0e38c5d - Show all commits

View File

@ -55,9 +55,15 @@ jobs:
run: |
cd web
docker image prune -f
cp src/favicon.dev.ico src/favicon.ico
ng build
docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-dev .
- name: Set version
run: |
chmod +x ./set-docker-compose-image-version.sh
./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cpl gv)-dev sh-edraft.de/sdb-web:$(npm run -s gv)-dev
- name: Deploy Stack to sh-edraft.de
uses: https://github.com/kgierke/portainer-stack-deployment@v1
with:

View File

@ -58,6 +58,11 @@ jobs:
ng build
docker build -t sh-edraft.de/sdb-web:$(npm run -s gv) .
- name: Set version
run: |
chmod +x ./set-docker-compose-image-version.sh
./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cpl gv) sh-edraft.de/sdb-web:$(npm run -s gv)
- name: Deploy Stack to sh-edraft.de
uses: https://github.com/kgierke/portainer-stack-deployment@v1
with:

View File

@ -55,9 +55,15 @@ jobs:
run: |
cd web
docker image prune -f
cp src/favicon.staging.ico src/favicon.ico
ng build
docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-staging .
- name: Set version
run: |
chmod +x ./set-docker-compose-image-version.sh
./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cpl gv)-staging sh-edraft.de/sdb-web:$(npm run -s gv)-staging
- name: Deploy Stack to sh-edraft.de
uses: https://github.com/kgierke/portainer-stack-deployment@v1
with:

@ -1 +1 @@
Subproject commit 777c23ac5fd1f2128980cc846f8ab46050b334cc
Subproject commit ea100c52731ca00e3d7d63fcab0e6b9405232717

BIN
web/src/favicon.dev.ico Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

BIN
web/src/favicon.staging.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB