From 22815b7f6cc51129005180efa9ae68ddf5aaeae8 Mon Sep 17 00:00:00 2001 From: Grzegorz Godlewski Date: Fri, 19 Jul 2024 11:31:55 +0200 Subject: [PATCH] Fix deploy --- .github/workflows/DevelopServerDeploy.yml | 2 ++ .github/workflows/ProdServerDeploy.yml | 5 +++-- .github/workflows/pull-request.yml | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/DevelopServerDeploy.yml b/.github/workflows/DevelopServerDeploy.yml index 6060a994..79a8d46b 100644 --- a/.github/workflows/DevelopServerDeploy.yml +++ b/.github/workflows/DevelopServerDeploy.yml @@ -61,6 +61,8 @@ jobs: with: image_name: "wikigdrive-develop" image_tag: "${{ github.sha }},latest" + registry: gcr.io + pull_image_and_stages: false push_image_and_stages: false build_extra_args: "{'--build-arg': 'GIT_SHA=${{ github.sha }}'}" diff --git a/.github/workflows/ProdServerDeploy.yml b/.github/workflows/ProdServerDeploy.yml index 889eef9e..03d6accc 100644 --- a/.github/workflows/ProdServerDeploy.yml +++ b/.github/workflows/ProdServerDeploy.yml @@ -60,8 +60,9 @@ jobs: - uses: whoan/docker-build-with-cache-action@v8 with: - image_name: "wikigdrive-prod" + image_name: "@mieweb/wikigdrive-prod" image_tag: "${{ github.sha }},latest" + pull_image_and_stages: false push_image_and_stages: false build_extra_args: "{'--build-arg': 'GIT_SHA=${{ github.sha }}'}" @@ -80,7 +81,7 @@ jobs: -e "GIT_SHA=${GITHUB_SHA}" \ --publish 127.0.0.1:3000:3000 \ --restart unless-stopped --restart-delay 30s \ - "wikigdrive-prod:${GITHUB_SHA}" wikigdrive \ + "@mieweb/wikigdrive-prod:${GITHUB_SHA}" wikigdrive \ --service_account /service_account.json \ --share_email mie-docs-wikigdrive@wikigdrive.iam.gserviceaccount.com \ --workdir /data \ diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 55849265..11f7a3dd 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -64,8 +64,9 @@ jobs: - name: build uses: whoan/docker-build-with-cache-action@v8 with: - image_name: "wikigdrive-feature" + image_name: "@mieweb/wikigdrive-feature" image_tag: "${{ github.sha }}" + pull_image_and_stages: false push_image_and_stages: false build_extra_args: "{'--build-arg': 'GIT_SHA=${{ github.sha }}'}" @@ -93,7 +94,7 @@ jobs: -e "AUTH_INSTANCE=pr-${{ github.event.number }}" \ -e "DOMAIN=https://pr-${{ github.event.number }}.wikigdrive.com" \ --link=zipkin:zipkin \ - "wikigdrive-feature:${{ github.sha }}" wikigdrive \ + "@mieweb/wikigdrive-feature:${{ github.sha }}" wikigdrive \ --service_account /service_account.json \ --share_email mie-docs-wikigdrive@wikigdrive.iam.gserviceaccount.com \ --workdir /data \