From e971ddc6b9f64f8b47630c6e66051ab02fac7071 Mon Sep 17 00:00:00 2001 From: Keyur Shah Date: Mon, 3 Jun 2024 18:08:51 -0700 Subject: [PATCH 1/2] Build autopush docker image with latest mixer and import code. --- build/ci/cloudbuild.deploy.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/build/ci/cloudbuild.deploy.yaml b/build/ci/cloudbuild.deploy.yaml index 7d9dff30eb..25e14760fd 100644 --- a/build/ci/cloudbuild.deploy.yaml +++ b/build/ci/cloudbuild.deploy.yaml @@ -46,6 +46,28 @@ steps: docker push gcr.io/datcom-ci/datacommons-website-compose:latest waitFor: ["-"] + - id: push-web-compose-autopush + name: gcr.io/cloud-builders/docker + entrypoint: "bash" + args: + - -c + - | + set -e + # Builds an autopush image with the latest mixer and import code + # instead of what the submodules reflect. + # This is to catch any breaking changes in those repos early. + git clone https://github.com/datacommonsorg/mixer.git + git clone https://github.com/datacommonsorg/import.git + + # Bundle container with website, esp and mixer. + docker build -f build/web_compose/Dockerfile \ + --tag gcr.io/datcom-ci/datacommons-website-compose:${SHORT_SHA}-autopush \ + --tag gcr.io/datcom-ci/datacommons-website-compose:latest-autopush \ + . + docker push gcr.io/datcom-ci/datacommons-website-compose:${SHORT_SHA}-autopush + docker push gcr.io/datcom-ci/datacommons-website-compose:latest-autopush + waitFor: ["-"] + - id: push-nl-server name: gcr.io/cloud-builders/docker entrypoint: "bash" From d879624e11cf550b8683ebc1db8d230c35396226 Mon Sep 17 00:00:00 2001 From: Keyur Shah Date: Mon, 3 Jun 2024 18:10:29 -0700 Subject: [PATCH 2/2] Remove obsolete comment. --- build/ci/cloudbuild.deploy.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/ci/cloudbuild.deploy.yaml b/build/ci/cloudbuild.deploy.yaml index 25e14760fd..b5512a9053 100644 --- a/build/ci/cloudbuild.deploy.yaml +++ b/build/ci/cloudbuild.deploy.yaml @@ -37,7 +37,6 @@ steps: git submodule foreach git pull origin master git submodule update --init --recursive - # Bundle container with website, esp and mixer. docker build -f build/web_compose/Dockerfile \ --tag gcr.io/datcom-ci/datacommons-website-compose:${SHORT_SHA} \ --tag gcr.io/datcom-ci/datacommons-website-compose:latest \ @@ -59,7 +58,6 @@ steps: git clone https://github.com/datacommonsorg/mixer.git git clone https://github.com/datacommonsorg/import.git - # Bundle container with website, esp and mixer. docker build -f build/web_compose/Dockerfile \ --tag gcr.io/datcom-ci/datacommons-website-compose:${SHORT_SHA}-autopush \ --tag gcr.io/datcom-ci/datacommons-website-compose:latest-autopush \