diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml index 81cfe48..641f677 100644 --- a/.gitea/workflows/deploy-dev.yaml +++ b/.gitea/workflows/deploy-dev.yaml @@ -30,24 +30,23 @@ jobs: run: docker push mathwave/sprint-repo:sprint-infra-nginx-dev - name: push gitea runner run: docker push mathwave/sprint-repo:gitea-runner - # prepare: - # name: prepare - # runs-on: [dev] - # needs: push - # steps: - # - name: login - # run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} - # - name: checkout - # uses: actions/checkout@v4 - # with: - # ref: dev - # - name: prepare - # run: chmod 777 ./prepare/run-development.sh && ./prepare/run-development.sh + prepare: + name: prepare + runs-on: [dev] + needs: push + steps: + - name: login + run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} + - name: checkout + uses: actions/checkout@v4 + with: + ref: dev + - name: prepare + run: chmod 777 ./prepare/run-development.sh && ./prepare/run-development.sh deploy-dev: name: Deploy dev runs-on: [prod] - # needs: prepare - needs: push + needs: prepare steps: - name: login run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} diff --git a/prepare/run-development.sh b/prepare/run-development.sh index 686da0f..2701a1e 100644 --- a/prepare/run-development.sh +++ b/prepare/run-development.sh @@ -1,6 +1,4 @@ docker login -u mathwave -p $DOCKERHUB_PASSWORD -docker network create -d overlay --attachable common-infra-nginx-development || true -docker network create -d overlay --attachable queues-development || true mkdir /sprint-data/mongo || true mkdir /sprint-data/redis || true mkdir /sprint-data/rabbitmq || true diff --git a/prepare/run-production.sh b/prepare/run-production.sh index d3e67e7..279e6d3 100644 --- a/prepare/run-production.sh +++ b/prepare/run-production.sh @@ -1,7 +1,9 @@ docker login -u mathwave -p $DOCKERHUB_PASSWORD docker network create -d overlay --attachable swarmpit-nginx || true docker network create -d overlay --attachable common-infra-nginx || true +docker network create -d overlay --attachable common-infra-nginx-development || true docker network create -d overlay --attachable queues || true +docker network create -d overlay --attachable queues-development || true docker network create -d overlay --attachable configurator || true mkdir /sprint-data/mongo || true mkdir /sprint-data/redis || true