Merge pull request 'dev into staging' (#457 ) from dev into staging

Reviewed-on: #457
Fixed actions
2023-12-09 22:23:06 +01:00 · 2023-12-09 22:17:56 +01:00 · 2023-12-09 22:10:04 +01:00 · 2023-12-09 22:02:57 +01:00 · 2023-12-09 21:51:47 +01:00 · 2023-12-09 21:46:01 +01:00
4 changed files with 246 additions and 47 deletions
--- a/.gitea/workflows/deploy_dev.yaml
+++ b/.gitea/workflows/deploy_dev.yaml
@ -6,9 +6,17 @@ on:
      - dev

 jobs:
-  on-push-deploy_sh-edraft:
+  pre-build:
    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: sh-edraft.de/act-runner:latest
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Shutdown stack
+        run: docker stack rm sdb_dev
+
+  build-bot:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
    steps:
      - name: Setup docker
        uses: https://github.com/papodaca/install-docker-action@main
@ -20,12 +28,58 @@ jobs:
          token: ${{ secrets.CI_ACCESS_TOKEN }}
          submodules: true

+      - name: Set version
+        run: |
+          cd bot/docker
+          chmod +x ./set-docker-compose-image-version.sh
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
+
      - name: Prepare bot build
        run: |
-          cd bot
          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cd bot
          cpl i

+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-dev .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd bot
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-dev
+
+  build-web:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Set version
+        run: |
+          cd bot/docker
+          chmod +x ./set-docker-compose-image-version.sh
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
+
      - name: Setup node
        uses: https://github.com/actions/setup-node@v3

@ -35,29 +89,45 @@ jobs:
          npm install -g ts-node
          npm ci

-      - name: Shutdown stack
-        run: docker stack rm sdb_dev
-
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-dev .
-
      - name: Build docker web
        run: |
          cd web
          docker image prune -f
          cp src/favicon.dev.ico src/favicon.ico
          npm run build
-          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-dev .
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-dev .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd web
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-dev
+
+  deploy:
+    needs: [ build-bot, build-web ]
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Install cpl
+        run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli

      - name: Set version
        run: |
          cd bot/docker
          chmod +x ./set-docker-compose-image-version.sh
-          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev

      - name: Deploy Stack to sh-edraft.de
        uses: https://github.com/kgierke/portainer-stack-deployment@v1
--- a/.gitea/workflows/deploy_prod.yaml
+++ b/.gitea/workflows/deploy_prod.yaml
@ -6,9 +6,17 @@ on:
      - master

 jobs:
-  on-push-deploy_sh-edraft:
+  pre-build:
    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: sh-edraft.de/act-runner:latest
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Shutdown stack
+        run: docker stack rm sdb_prod
+
+  build-bot:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
    steps:
      - name: Setup docker
        uses: https://github.com/papodaca/install-docker-action@main
@ -22,10 +30,44 @@ jobs:

      - name: Prepare bot build
        run: |
-          cd bot
          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cd bot
          cpl i

+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv) .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd bot
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)
+
+  build-web:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
      - name: Setup node
        uses: https://github.com/actions/setup-node@v3

@ -35,28 +77,45 @@ jobs:
          npm install -g ts-node
          npm ci

-      - name: Shutdown stack
-        run: docker stack rm sdb_prod
-
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t sh-edraft.de/sdb-bot:$(cpl gv) .
-
      - name: Build docker web
        run: |
          cd web
          docker image prune -f
+          cp src/favicon.ico src/favicon.ico
          npm run build
-          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv) .
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv) .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd web
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)
+
+  deploy:
+    needs: [ build-bot, build-web ]
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Install cpl
+        run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli

      - name: Set version
        run: |
          cd bot/docker
          chmod +x ./set-docker-compose-image-version.sh
-          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv) sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv) git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)

      - name: Deploy Stack to sh-edraft.de
        uses: https://github.com/kgierke/portainer-stack-deployment@v1
--- a/.gitea/workflows/deploy_staging.yaml
+++ b/.gitea/workflows/deploy_staging.yaml
@ -6,9 +6,17 @@ on:
      - staging

 jobs:
-  on-push-deploy_sh-edraft:
+  pre-build:
    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: sh-edraft.de/act-runner:latest
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Shutdown stack
+        run: docker stack rm sdb_test
+
+  build-bot:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
    steps:
      - name: Setup docker
        uses: https://github.com/papodaca/install-docker-action@main
@ -20,12 +28,58 @@ jobs:
          token: ${{ secrets.CI_ACCESS_TOKEN }}
          submodules: true

+      - name: Set version
+        run: |
+          cd bot/docker
+          chmod +x ./set-docker-compose-image-version.sh
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
+
      - name: Prepare bot build
        run: |
-          cd bot
          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cd bot
          cpl i

+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-staging .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd bot
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cpl gv)-staging
+
+  build-web:
+    needs: pre-build
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Set version
+        run: |
+          cd bot/docker
+          chmod +x ./set-docker-compose-image-version.sh
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
+
      - name: Setup node
        uses: https://github.com/actions/setup-node@v3

@ -35,29 +89,45 @@ jobs:
          npm install -g ts-node
          npm ci

-      - name: Shutdown stack
-        run: docker stack rm sdb_staging
-
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-staging .
-
      - name: Build docker web
        run: |
          cd web
          docker image prune -f
          cp src/favicon.staging.ico src/favicon.ico
          npm run build
-          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-staging .
+          docker build -t git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-staging .
+
+      - name: Login to registry git.sh-edraft.de
+        uses: https://github.com/docker/login-action@v1
+        with:
+          registry: git.sh-edraft.de
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Push image
+        run: |
+          cd web
+          docker push git.sh-edraft.de/sh-edraft.de/sdb-web:$(npm run -s gv)-staging
+
+  deploy:
+    needs: [ build-bot, build-web ]
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Install cpl
+        run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli

      - name: Set version
        run: |
          cd bot/docker
          chmod +x ./set-docker-compose-image-version.sh
-          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
+          ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging

      - name: Deploy Stack to sh-edraft.de
        uses: https://github.com/kgierke/portainer-stack-deployment@v1
@ -66,6 +136,6 @@ jobs:
          portainer-username: "gitea_job"
          portainer-password: "${{ secrets.docker_job }}"
          portainer-endpoint: 2
-          name: sdb_staging
+          name: sdb_test
          file: bot/docker/docker-compose.staging.yml
          variables: '{}'
--- a/bot/docker
+++ b/bot/docker
@ -1 +1 @@
-Subproject commit abd17085309242a2aa0b415a9a14d5390163dfc2
+Subproject commit 36ed43055df2979b5c4c486a161b1754803915cc
Author	SHA1	Message	Date
Sven Heidemann	af348b85a4	Merge pull request 'dev into staging' (#457 ) from dev into staging All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 1m46s Details Deploy staging on push / build-web (push) Successful in 1m44s Details Deploy staging on push / deploy (push) Successful in 27s Details Reviewed-on: #457	2023-12-09 22:23:06 +01:00
Sven Heidemann	7ed621a25b	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m52s Details Deploy dev on push / build-web (push) Successful in 1m41s Details Deploy dev on push / deploy (push) Successful in 21s Details	2023-12-09 22:17:56 +01:00
Sven Heidemann	013f953a7f	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m53s Details Deploy dev on push / build-web (push) Successful in 1m42s Details Deploy dev on push / deploy (push) Successful in 23s Details	2023-12-09 22:10:04 +01:00
Sven Heidemann	4163532696	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m52s Details Deploy dev on push / build-web (push) Successful in 1m57s Details Deploy dev on push / deploy (push) Successful in 6s Details	2023-12-09 22:02:57 +01:00
Sven Heidemann	b6a1172cc1	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 2m0s Details Deploy dev on push / build-web (push) Successful in 1m47s Details Deploy dev on push / deploy (push) Successful in 6s Details	2023-12-09 21:51:47 +01:00
Sven Heidemann	20bdb6bd98	Updated compose files All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 2m1s Details Deploy dev on push / build-web (push) Successful in 1m42s Details Deploy dev on push / deploy (push) Successful in 5s Details	2023-12-09 21:46:01 +01:00
Sven Heidemann	3f13f65932	Updated other env actions	2023-12-09 21:43:34 +01:00
Sven Heidemann	711e184895	Fixed dev action All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m48s Details Deploy dev on push / build-web (push) Successful in 1m53s Details Deploy dev on push / deploy (push) Successful in 5s Details	2023-12-09 21:34:21 +01:00
Sven Heidemann	7e3975f4be	Fixed dev action Some checks failed Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 2m13s Details Deploy dev on push / build-web (push) Successful in 1m43s Details Deploy dev on push / deploy (push) Failing after 1s Details	2023-12-09 21:28:15 +01:00
Sven Heidemann	d4f4f39522	Fixed dev action Some checks failed Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Failing after 1m55s Details Deploy dev on push / build-web (push) Failing after 1m45s Details Deploy dev on push / deploy (push) Has been skipped Details	2023-12-09 21:22:00 +01:00
Sven Heidemann	af9c55e4b1	Updated dev action Some checks failed Deploy dev on push / pre-build (push) Successful in 2s Details Deploy dev on push / build-bot (push) Failing after 2m3s Details Deploy dev on push / build-web (push) Failing after 2m5s Details Deploy dev on push / deploy (push) Has been skipped Details	2023-12-09 21:00:20 +01:00