Skip to content

Commit

Permalink
Fix deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
ggodlewski committed Jul 19, 2024
1 parent c7b08f7 commit 60485b2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/DevelopServerDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ jobs:

- uses: whoan/docker-build-with-cache-action@v8
with:
image_name: "wikigdrive-develop"
image_name: "@mieweb/wikigdrive-develop"
image_tag: "${{ github.sha }},latest"
pull_image_and_stages: false
push_image_and_stages: false
build_extra_args: "{'--build-arg': 'GIT_SHA=${{ github.sha }}'}"

Expand All @@ -83,7 +84,7 @@ jobs:
-e "ZIPKIN_SERVICE=wikigdrive-develop" \
--link=zipkin:zipkin \
--publish 127.0.0.1:4000:3000 \
"wikigdrive-develop:${GITHUB_SHA}" wikigdrive \
"@mieweb/wikigdrive-develop:${GITHUB_SHA}" wikigdrive \
--service_account /service_account.json \
--share_email mie-docs-wikigdrive@wikigdrive.iam.gserviceaccount.com \
--workdir /data \
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/ProdServerDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'}"

Expand All @@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'}"

Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 60485b2

Please sign in to comment.