diff --git a/.gitea/workflows/deploy_dev.yaml b/.gitea/workflows/deploy_dev.yaml index b5d91fdb..edc54149 100644 --- a/.gitea/workflows/deploy_dev.yaml +++ b/.gitea/workflows/deploy_dev.yaml @@ -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: diff --git a/.gitea/workflows/deploy_prod.yaml b/.gitea/workflows/deploy_prod.yaml index f91460a5..06465d13 100644 --- a/.gitea/workflows/deploy_prod.yaml +++ b/.gitea/workflows/deploy_prod.yaml @@ -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: diff --git a/.gitea/workflows/deploy_staging.yaml b/.gitea/workflows/deploy_staging.yaml index e06599ae..246796a7 100644 --- a/.gitea/workflows/deploy_staging.yaml +++ b/.gitea/workflows/deploy_staging.yaml @@ -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: diff --git a/bot/docker b/bot/docker index 777c23ac..ea100c52 160000 --- a/bot/docker +++ b/bot/docker @@ -1 +1 @@ -Subproject commit 777c23ac5fd1f2128980cc846f8ab46050b334cc +Subproject commit ea100c52731ca00e3d7d63fcab0e6b9405232717 diff --git a/web/src/favicon.dev.ico b/web/src/favicon.dev.ico new file mode 100755 index 00000000..1516cb96 Binary files /dev/null and b/web/src/favicon.dev.ico differ diff --git a/web/src/favicon.staging.png b/web/src/favicon.staging.png new file mode 100755 index 00000000..4fabf663 Binary files /dev/null and b/web/src/favicon.staging.png differ