diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 7437dbf..82a5477 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -1,7 +1,21 @@ on: [push] jobs: - prepare: + # prepare: + # runs-on: docker + # outputs: + # chat_back_image: ${{ steps.set-vars.outputs.CHAT_BACK_IMAGE }} + # celery_image: ${{ steps.set-vars.outputs.CELERY_IMAGE }} + # steps: + # - name: Set vars + # id: set-vars + # run: | + # echo 'CHAT_BACK_IMAGE=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/chat_back:${{ env.GITHUB_SHA }}' >> ${{ env.GITHUB_OUTPUT }} + # echo 'CELERY_IMAGE=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/celery:${{ env.GITHUB_SHA }}' >> ${{ env.GITHUB_OUTPUT }} + + + + build: runs-on: docker outputs: chat_back_image: ${{ steps.set-vars.outputs.CHAT_BACK_IMAGE }} @@ -13,16 +27,10 @@ jobs: echo 'CHAT_BACK_IMAGE=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/chat_back:${{ env.GITHUB_SHA }}' >> ${{ env.GITHUB_OUTPUT }} echo 'CELERY_IMAGE=git.urec56.ru/${{ env.GITHUB_REPOSITORY_OWNER }}/celery:${{ env.GITHUB_SHA }}' >> ${{ env.GITHUB_OUTPUT }} - - - build: - runs-on: docker - needs: prepare - steps: - name: Check env run: | - echo '${{ needs.prepare.outputs.chat_back_image }}' - echo '${{ needs.prepare.outputs.celery_image }}' + echo '${{ needs.set-vars.outputs.chat_back_image }}' + echo '${{ needs.set-vars.outputs.celery_image }}' - name: Get code @@ -44,7 +52,7 @@ jobs: context: . file: docker/Dockerfile_back push: true - tags: ${{ needs.prepare.outputs.chat_back_image }} + tags: ${{ needs.set-vars.outputs.chat_back_image }} cache-from: type=gha cache-to: type=gha,mode=max @@ -55,7 +63,7 @@ jobs: context: . file: docker/Dockerfile_celery push: true - tags: ${{ needs.prepare.outputs.celery_image }} + tags: ${{ needs.set-vars.outputs.celery_image }} cache-from: type=gha cache-to: type=gha,mode=max @@ -63,7 +71,6 @@ jobs: deploy: runs-on: deploy needs: - - prepare - build steps: @@ -116,19 +123,10 @@ jobs: echo 'REGISTRATED_USER=${{ vars.REGISTRATED_USER }}' >> .env echo 'VERIFICATED_USER=${{ vars.VERIFICATED_USER }}' >> .env - - echo 'MODE=${{ vars.MODE }}' - echo 'ADMIN_USER=${{ vars.ADMIN_USER }}' - echo 'ADMIN_USER_ID=${{ vars.ADMIN_USER_ID }}' - echo 'REGISTRATED_USER=${{ vars.REGISTRATED_USER }}' - echo 'VERIFICATED_USER=${{ vars.VERIFICATED_USER }}' - - cat .env - - name: Pull and run container run: | - export 'CHAT_BACK_IMAGE=${{ needs.prepare.outputs.chat_back_image }}' - export 'CHAT_CELERY_IMAGE=${{ needs.prepare.outputs.celery_image }}' + export 'CHAT_BACK_IMAGE=${{ needs.build.outputs.chat_back_image }}' + export 'CHAT_CELERY_IMAGE=${{ needs.build.outputs.celery_image }}' docker pull ${CHAT_BACK_IMAGE} docker pull ${CHAT_CELERY_IMAGE}