diff --git a/.github/workflows/production-deploy.yaml b/.github/workflows/production-deploy.yaml index 6bd92f4e79..31bb7f228b 100644 --- a/.github/workflows/production-deploy.yaml +++ b/.github/workflows/production-deploy.yaml @@ -164,7 +164,7 @@ jobs: context: . push: true build-args: | - SRC_IMG=us-east1-docker.pkg/${{ secrets.PROD_GKE_PROJECT }}/containers/${{ secrets.IMAGE_NAME }}-web:${{ needs.workflow-check.outputs.ref }} + SRC_IMG=us-east1-docker.pkg.dev/${{ secrets.PROD_GKE_PROJECT }}/containers/${{ secrets.IMAGE_NAME }}-web:${{ needs.workflow-check.outputs.ref }} file: ./build/${{ matrix.app }}/Dockerfile tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/build/ci/production-helm-deploy.sh b/build/ci/production-helm-deploy.sh index b0a21dd58e..c34329fb2e 100755 --- a/build/ci/production-helm-deploy.sh +++ b/build/ci/production-helm-deploy.sh @@ -2,10 +2,10 @@ set -x set -e -export WEB_IMAGE="us-east1-docker.pkg/$PROJECT_ID/containers/$IMAGE_NAME-web" -export NODE_IMAGE="us-east1-docker.pkg/$PROJECT_ID/containers/$IMAGE_NAME-node" -export ASSET_IMAGE="us-east1-docker.pkg/$PROJECT_ID/containers/$IMAGE_NAME-asset" -export LINKER_IMAGE="us-east1-docker.pkg/$PROJECT_ID/containers/$IMAGE_NAME-linker" +export WEB_IMAGE="us-east1-docker.pkg.dev/$PROJECT_ID/containers/$IMAGE_NAME-web" +export NODE_IMAGE="us-east1-docker.pkg.dev/$PROJECT_ID/containers/$IMAGE_NAME-node" +export ASSET_IMAGE="us-east1-docker.pkg.dev/$PROJECT_ID/containers/$IMAGE_NAME-asset" +export LINKER_IMAGE="us-east1-docker.pkg.dev/$PROJECT_ID/containers/$IMAGE_NAME-linker" export TAG="$GIT_COMMIT" yq e -i '.web.containerImage.imageRegistry = strenv(WEB_IMAGE)' $1 diff --git a/helm-chart/sefaria-project/values.yaml b/helm-chart/sefaria-project/values.yaml index a3eb41b387..d15fbd8e36 100644 --- a/helm-chart/sefaria-project/values.yaml +++ b/helm-chart/sefaria-project/values.yaml @@ -57,7 +57,7 @@ web: # APP: web containerImage: # Full path of the image registry imclusive of the image name - imageRegistry: us-east1-docker.pkg/production-deployment/containers/sefaria-web + imageRegistry: us-east1-docker.pkg.dev/production-deployment/containers/sefaria-web # Commit id of the repo for which the image build has been triggered. tag: latest replicaCount: 1 @@ -114,7 +114,7 @@ linker: # APP: web containerImage: # Full path of the image registry imclusive of the image name - imageRegistry: us-east1-docker.pkg/production-deployment/containers/sefaria-linker + imageRegistry: us-east1-docker.pkg.dev/production-deployment/containers/sefaria-linker # Commit id of the repo for which the image build has been triggered. tag: latest replicaCount: 1 @@ -179,7 +179,7 @@ redis: nodejs: containerImage: # Full path of the image registry inclusive of the image name - imageRegistry: us-east1-docker.pkg/production-deployment/containers/sefaria-node + imageRegistry: us-east1-docker.pkg.dev/production-deployment/containers/sefaria-node # Commit id of the repo for which the image build has been triggered. tag: latest # key-pair values to load into node pod environment. Takes precedence over global localsettings @@ -271,7 +271,7 @@ ingress: nginx: containerImage: # Full path of the image registry inclusive of the image name - imageRegistry: us-east1-docker.pkg/production-deployment/containers/sefaria-asset + imageRegistry: us-east1-docker.pkg.dev/production-deployment/containers/sefaria-asset # Commit id of the repo for which the image build has been triggered. tag: latest # set to search-democracy for democracy @@ -294,7 +294,7 @@ monitor: # APP: monitor containerImage: # Full path of the image registry inclusive of the image name - imageRegistry: us-east1-docker.pkg/production-deployment/containers/sefaria-web + imageRegistry: us-east1-docker.pkg.dev/production-deployment/containers/sefaria-web # Commit id of the repo for which the image build has been triggered. tag: latest replicaCount: 1