diff --git a/.gitea/workflows/deploy_dev.yaml b/.gitea/workflows/deploy_dev.yaml index 73f98948..be8e0e2a 100644 --- a/.gitea/workflows/deploy_dev.yaml +++ b/.gitea/workflows/deploy_dev.yaml @@ -26,21 +26,12 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true - - name: Shutdown stack - run: docker stack rm sdb_staging - - name: Prepare bot build run: | cd bot pip install --extra-index-url https://pip.sh-edraft.de cpl-cli cpl i - - name: Build docker bot - run: | - cd bot - docker image prune -f - cpl docker-build - - name: Setup node uses: https://github.com/actions/setup-node@v3 @@ -50,6 +41,15 @@ jobs: npm install -g ts-node npm i + - name: Shutdown stack + run: docker stack rm sdb_staging + + - name: Build docker bot + run: | + cd bot + docker image prune -f + cpl docker-build + - name: Build docker web run: | cd web diff --git a/.gitea/workflows/deploy_prod.yaml b/.gitea/workflows/deploy_prod.yaml index bf530ed8..906eda1b 100644 --- a/.gitea/workflows/deploy_prod.yaml +++ b/.gitea/workflows/deploy_prod.yaml @@ -1,5 +1,5 @@ -name: Deploy dev on push -run-name: Deploy dev on push +name: Deploy prod on push +run-name: Deploy prod on push on: push: branches: @@ -22,9 +22,9 @@ jobs: - name: Clone Repository uses: https://github.com/actions/checkout@v3 - - - name: Shutdown stack - run: docker stack rm sdb_prod + with: + token: ${{ secrets.CI_ACCESS_TOKEN }} + submodules: true - name: Prepare bot build run: | @@ -32,12 +32,6 @@ jobs: pip install --extra-index-url https://pip.sh-edraft.de cpl-cli cpl i - - name: Build docker bot - run: | - cd bot - docker image prune -f - cpl docker-build - - name: Setup node uses: https://github.com/actions/setup-node@v3 @@ -47,6 +41,15 @@ jobs: npm install -g ts-node npm i + - name: Shutdown stack + run: docker stack rm sdb_prod + + - name: Build docker bot + run: | + cd bot + docker image prune -f + cpl docker-build + - name: Build docker web run: | cd web @@ -61,5 +64,5 @@ jobs: portainer-password: "${{ secrets.docker_job }}" portainer-endpoint: 2 name: sdb_prod - file: ./docker-compose.yml + file: bot/docker/docker-compose.yml variables: '{}'