From 945801d8b026306404b145fc9eb3138da48de438 Mon Sep 17 00:00:00 2001 From: Terence Date: Thu, 12 Nov 2020 10:02:31 +0800 Subject: [PATCH 1/8] Ensure consistency of github workflow Signed-off-by: Terence --- .github/workflows/master_only.yml | 4 ++-- infra/docker/jobservice/Dockerfile | 1 - infra/docker/jupyter/Dockerfile | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml index deaf0058895..2734f4c4442 100644 --- a/.github/workflows/master_only.yml +++ b/.github/workflows/master_only.yml @@ -29,9 +29,9 @@ jobs: - name: Get version run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - name: Build image - run: make build-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=${GITHUB_SHA} REVISION=${RELEASE_VERSION} + run: make build-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=${GITHUB_SHA} REVISION=${GITHUB_SHA} - name: Push image - run: make push-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=${GITHUB_SHA} REVISION=${RELEASE_VERSION} + run: make push-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=${GITHUB_SHA} - name: Push development Docker image run: | if [ ${GITHUB_REF#refs/*/} == "master" ]; then diff --git a/infra/docker/jobservice/Dockerfile b/infra/docker/jobservice/Dockerfile index 9a1708ace32..9fd991f76c1 100644 --- a/infra/docker/jobservice/Dockerfile +++ b/infra/docker/jobservice/Dockerfile @@ -1,7 +1,6 @@ FROM jupyter/pyspark-notebook:ae5f7e104dd5 USER root -ARG REVISION WORKDIR /feast COPY sdk/python sdk/python diff --git a/infra/docker/jupyter/Dockerfile b/infra/docker/jupyter/Dockerfile index d697f445610..567182a0028 100644 --- a/infra/docker/jupyter/Dockerfile +++ b/infra/docker/jupyter/Dockerfile @@ -1,7 +1,6 @@ FROM jupyter/pyspark-notebook:ae5f7e104dd5 USER root -ARG REVISION WORKDIR /feast COPY sdk/python sdk/python From 5a3be8e6f31c8cd9d91dfcde46773fa3e1e898e7 Mon Sep 17 00:00:00 2001 From: Terence Date: Fri, 13 Nov 2020 16:14:48 +0800 Subject: [PATCH 2/8] Shift GCR latest tag workflow to release Signed-off-by: Terence --- .github/workflows/complete.yml | 2 +- .github/workflows/master_only.yml | 25 +------------------------ .github/workflows/release.yml | 31 +++++++++++++++++++++++++++++-- Makefile | 4 ++-- infra/docker/core/Dockerfile | 4 ++-- infra/docker/serving/Dockerfile | 4 ++-- 6 files changed, 37 insertions(+), 33 deletions(-) diff --git a/.github/workflows/complete.yml b/.github/workflows/complete.yml index 6f803ea42db..06fd32d7811 100644 --- a/.github/workflows/complete.yml +++ b/.github/workflows/complete.yml @@ -25,7 +25,7 @@ jobs: --archive-uri ${MAVEN_CACHE} \ --output-dir . - name: Build image - run: make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA} REVISION=dev + run: make build-${{ matrix.component }}-docker REGISTRY=${REGISTRY} VERSION=${GITHUB_SHA} - name: Push image run: | docker push ${REGISTRY}/feast-${{ matrix.component }}:${GITHUB_SHA} diff --git a/.github/workflows/master_only.yml b/.github/workflows/master_only.yml index 2734f4c4442..e165c9396eb 100644 --- a/.github/workflows/master_only.yml +++ b/.github/workflows/master_only.yml @@ -29,7 +29,7 @@ jobs: - name: Get version run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - name: Build image - run: make build-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=${GITHUB_SHA} REVISION=${GITHUB_SHA} + run: make build-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=${GITHUB_SHA} - name: Push image run: make push-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=${GITHUB_SHA} - name: Push development Docker image @@ -38,29 +38,6 @@ jobs: docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:develop docker push gcr.io/kf-feast/feast-${{ matrix.component }}:develop fi - - name: Push versioned Docker image - run: | - source infra/scripts/setup-common-functions.sh - # Build and push semver tagged commits - # Regular expression should match MAJOR.MINOR.PATCH[-PRERELEASE[.IDENTIFIER]] - # eg. v0.7.1 v0.7.2-alpha v0.7.2-rc.1 - SEMVER_REGEX='^v[0-9]+\.[0-9]+\.[0-9]+(-([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$' - if echo "${RELEASE_VERSION}" | grep -P "$SEMVER_REGEX" &>/dev/null ; then - VERSION_WITHOUT_PREFIX=${RELEASE_VERSION:1} - - docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} - docker push gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} - - # Also update "latest" image if tagged commit is pushed to stable branch - HIGHEST_SEMVER_TAG=$(get_tag_release -m) - echo "Only push to latest tag if tag is the highest semver version $HIGHEST_SEMVER_TAG" - - if [ "${VERSION_WITHOUT_PREFIX}" = "${HIGHEST_SEMVER_TAG:1}" ] - then - docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:latest - docker push gcr.io/kf-feast/feast-${{ matrix.component }}:latest - fi - fi publish-ingestion-jar: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0601bd1ff35..52a5358ad2d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,7 +73,7 @@ jobs: infra/scripts/download-maven-cache.sh \ --archive-uri ${MAVEN_CACHE} \ --output-dir . - - name: Build and push + - name: Build and push versioned image to Dockerhub uses: docker/build-push-action@v2 env: RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }} @@ -84,7 +84,7 @@ jobs: tags: feastdev/feast-${{ matrix.component }}:${{ needs.get-version.outputs.release_version }} build-args: | REVISION=$RELEASE_VERSION - - name: Build and push latest + - name: Build and push latest image to Dockerhub uses: docker/build-push-action@v2 env: RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }} @@ -98,6 +98,33 @@ jobs: tags: feastdev/feast-${{ matrix.component }}:latest build-args: | REVISION=$RELEASE_VERSION + - name: Build and push versioned image to GCR + env: + RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }} + run: | + make build-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=$RELEASE_VERSION + make push-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=$RELEASE_VERSION + source infra/scripts/setup-common-functions.sh + # Build and push semver tagged commits + # Regular expression should match MAJOR.MINOR.PATCH[-PRERELEASE[.IDENTIFIER]] + # eg. v0.7.1 v0.7.2-alpha v0.7.2-rc.1 + SEMVER_REGEX='^v[0-9]+\.[0-9]+\.[0-9]+(-([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$' + if echo "${RELEASE_VERSION}" | grep -P "$SEMVER_REGEX" &>/dev/null ; then + VERSION_WITHOUT_PREFIX=${RELEASE_VERSION:1} + + docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} + docker push gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} + + # Also update "latest" image if tagged commit is pushed to stable branch + HIGHEST_SEMVER_TAG=$(get_tag_release -m) + echo "Only push to latest tag if tag is the highest semver version $HIGHEST_SEMVER_TAG" + + if [ "${VERSION_WITHOUT_PREFIX}" = "${HIGHEST_SEMVER_TAG:1}" ] + then + docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:latest + docker push gcr.io/kf-feast/feast-${{ matrix.component }}:latest + fi + fi publish-helm-charts: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index b1b9be9c077..479171aa649 100644 --- a/Makefile +++ b/Makefile @@ -142,13 +142,13 @@ push-jupyter-docker: docker push $(REGISTRY)/feast-jupyter:$(VERSION) build-core-docker: - docker build $(if, $(REVISION),--build-arg REVISION=$(REVISION),) -t $(REGISTRY)/feast-core:$(VERSION) -f infra/docker/core/Dockerfile . + docker build --build-arg VERSION=$(VERSION) -t $(REGISTRY)/feast-core:$(VERSION) -f infra/docker/core/Dockerfile . build-jobservice-docker: docker build -t $(REGISTRY)/feast-jobservice:$(VERSION) -f infra/docker/jobservice/Dockerfile . build-serving-docker: - docker build $(if, $(REVISION),--build-arg REVISION=$(REVISION),) -t $(REGISTRY)/feast-serving:$(VERSION) -f infra/docker/serving/Dockerfile . + docker build --build-arg VERSION=$(VERSION) -t $(REGISTRY)/feast-serving:$(VERSION) -f infra/docker/serving/Dockerfile . build-ci-docker: docker build -t $(REGISTRY)/feast-ci:$(VERSION) -f infra/docker/ci/Dockerfile . diff --git a/infra/docker/core/Dockerfile b/infra/docker/core/Dockerfile index b4f19868540..9f9260fd8d4 100644 --- a/infra/docker/core/Dockerfile +++ b/infra/docker/core/Dockerfile @@ -29,8 +29,8 @@ RUN mvn dependency:go-offline -DexcludeGroupIds:dev.feast 2>/dev/null || true COPY . . -ARG REVISION=dev -RUN mvn --also-make --projects core -Drevision=$REVISION \ +ARG VERSION=dev +RUN mvn --also-make --projects core -Drevision=$VERSION \ -DskipUTs=true --batch-mode clean package # diff --git a/infra/docker/serving/Dockerfile b/infra/docker/serving/Dockerfile index 5fa2988244f..615b6f1fa76 100644 --- a/infra/docker/serving/Dockerfile +++ b/infra/docker/serving/Dockerfile @@ -29,8 +29,8 @@ RUN mvn dependency:go-offline -DexcludeGroupIds:dev.feast 2>/dev/null || true COPY . . -ARG REVISION=dev -RUN mvn --also-make --projects serving -Drevision=$REVISION \ +ARG VERSION=dev +RUN mvn --also-make --projects serving -Drevision=$VERSION \ -DskipUTs=true --batch-mode clean package # # Download grpc_health_probe to run health check for Feast Serving From a4b7786081690c6587f8658d7f79eb9ef0b90de5 Mon Sep 17 00:00:00 2001 From: Terence Date: Fri, 13 Nov 2020 16:26:30 +0800 Subject: [PATCH 3/8] Fix production build arg Signed-off-by: Terence --- infra/docker/core/Dockerfile | 4 ++-- infra/docker/serving/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infra/docker/core/Dockerfile b/infra/docker/core/Dockerfile index 9f9260fd8d4..76492280da5 100644 --- a/infra/docker/core/Dockerfile +++ b/infra/docker/core/Dockerfile @@ -46,9 +46,9 @@ RUN wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/downloa # ============================================================ FROM openjdk:11-jre as production -ARG REVISION=dev +ARG VERSION=dev -COPY --from=builder /build/core/target/feast-core-$REVISION-exec.jar /opt/feast/feast-core.jar +COPY --from=builder /build/core/target/feast-core-$VERSION-exec.jar /opt/feast/feast-core.jar COPY --from=builder /usr/bin/grpc-health-probe /usr/bin/grpc-health-probe CMD ["java",\ diff --git a/infra/docker/serving/Dockerfile b/infra/docker/serving/Dockerfile index 615b6f1fa76..b6b456f7ce1 100644 --- a/infra/docker/serving/Dockerfile +++ b/infra/docker/serving/Dockerfile @@ -45,8 +45,8 @@ RUN wget -q https://github.com/grpc-ecosystem/grpc-health-probe/releases/downloa # ============================================================ FROM openjdk:11-jre-slim as production -ARG REVISION=dev -COPY --from=builder /build/serving/target/feast-serving-$REVISION-exec.jar /opt/feast/feast-serving.jar +ARG VERSION=dev +COPY --from=builder /build/serving/target/feast-serving-$VERSION-exec.jar /opt/feast/feast-serving.jar COPY --from=builder /usr/bin/grpc-health-probe /usr/bin/grpc-health-probe CMD ["java",\ "-Xms1024m",\ From 376e822344975b00182213fe30e6a49dc663ec05 Mon Sep 17 00:00:00 2001 From: Terence Date: Fri, 13 Nov 2020 16:45:32 +0800 Subject: [PATCH 4/8] Fix docker-compose test Signed-off-by: Terence --- infra/scripts/test-docker-compose.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/scripts/test-docker-compose.sh b/infra/scripts/test-docker-compose.sh index 348444956ff..e3a313c0566 100755 --- a/infra/scripts/test-docker-compose.sh +++ b/infra/scripts/test-docker-compose.sh @@ -69,4 +69,4 @@ docker exec \ -e DISABLE_FEAST_SERVICE_FIXTURES=true \ --user root \ feast_jupyter_1 bash \ - -c 'cd /feast/tests && python -m pip install -r requirements.txt && pytest e2e/ --ingestion-jar https://storage.googleapis.com/feast-jobs/spark/ingestion/feast-ingestion-spark-${FEAST_VERSION}.jar --redis-url redis:6379 --core-url core:6565 --serving-url online_serving:6566 --job-service-url jobservice:6568 --staging-path file:///shared/staging/ --kafka-brokers kafka:9092 --feast-version develop' + -c "cd /feast/tests && python -m pip install -r requirements.txt && pytest e2e/ --ingestion-jar https://storage.googleapis.com/feast-jobs/spark/ingestion/feast-ingestion-spark-${FEAST_VERSION}.jar --redis-url redis:6379 --core-url core:6565 --serving-url online_serving:6566 --job-service-url jobservice:6568 --staging-path file:///shared/staging/ --kafka-brokers kafka:9092 --feast-version ${FEAST_VERSION}" From 666171064b67e7ab6202ebe726f69e5950e7a2ee Mon Sep 17 00:00:00 2001 From: Terence Date: Sun, 15 Nov 2020 09:14:21 +0800 Subject: [PATCH 5/8] Use single step for dockerhub build and push Signed-off-by: Terence --- .github/workflows/release.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 52a5358ad2d..f77298cdee1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -73,17 +73,6 @@ jobs: infra/scripts/download-maven-cache.sh \ --archive-uri ${MAVEN_CACHE} \ --output-dir . - - name: Build and push versioned image to Dockerhub - uses: docker/build-push-action@v2 - env: - RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }} - with: - push: true - context: . - file: ./infra/docker/${{ matrix.component }}/Dockerfile - tags: feastdev/feast-${{ matrix.component }}:${{ needs.get-version.outputs.release_version }} - build-args: | - REVISION=$RELEASE_VERSION - name: Build and push latest image to Dockerhub uses: docker/build-push-action@v2 env: @@ -95,9 +84,11 @@ jobs: push: true context: . file: ./infra/docker/${{ matrix.component }}/Dockerfile - tags: feastdev/feast-${{ matrix.component }}:latest + tags: | + feastdev/feast-${{ matrix.component }}:${{ needs.get-version.outputs.release_version }} + feastdev/feast-${{ matrix.component }}:latest build-args: | - REVISION=$RELEASE_VERSION + VERSION=$RELEASE_VERSION - name: Build and push versioned image to GCR env: RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }} From e6627928658fe3be09962da0d50b9861f2698e03 Mon Sep 17 00:00:00 2001 From: Terence Date: Sun, 15 Nov 2020 09:17:31 +0800 Subject: [PATCH 6/8] Revert docker compose fix Signed-off-by: Terence --- infra/scripts/test-docker-compose.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infra/scripts/test-docker-compose.sh b/infra/scripts/test-docker-compose.sh index e3a313c0566..348444956ff 100755 --- a/infra/scripts/test-docker-compose.sh +++ b/infra/scripts/test-docker-compose.sh @@ -69,4 +69,4 @@ docker exec \ -e DISABLE_FEAST_SERVICE_FIXTURES=true \ --user root \ feast_jupyter_1 bash \ - -c "cd /feast/tests && python -m pip install -r requirements.txt && pytest e2e/ --ingestion-jar https://storage.googleapis.com/feast-jobs/spark/ingestion/feast-ingestion-spark-${FEAST_VERSION}.jar --redis-url redis:6379 --core-url core:6565 --serving-url online_serving:6566 --job-service-url jobservice:6568 --staging-path file:///shared/staging/ --kafka-brokers kafka:9092 --feast-version ${FEAST_VERSION}" + -c 'cd /feast/tests && python -m pip install -r requirements.txt && pytest e2e/ --ingestion-jar https://storage.googleapis.com/feast-jobs/spark/ingestion/feast-ingestion-spark-${FEAST_VERSION}.jar --redis-url redis:6379 --core-url core:6565 --serving-url online_serving:6566 --job-service-url jobservice:6568 --staging-path file:///shared/staging/ --kafka-brokers kafka:9092 --feast-version develop' From 8232cdbba0fee626071b9ee15bbe9b0488cd6e2c Mon Sep 17 00:00:00 2001 From: Terence Date: Mon, 16 Nov 2020 10:58:32 +0800 Subject: [PATCH 7/8] Simplify to single build push stage Signed-off-by: Terence --- .github/workflows/release.yml | 56 +++++++++++++---------------------- 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f77298cdee1..f4085e4273b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,53 +68,37 @@ jobs: export_default_credentials: true project_id: ${{ secrets.GCP_PROJECT_ID }} service_account_key: ${{ secrets.GCP_SA_KEY }} + - run: gcloud auth configure-docker --quiet - name: Get m2 cache run: | infra/scripts/download-maven-cache.sh \ --archive-uri ${MAVEN_CACHE} \ --output-dir . - - name: Build and push latest image to Dockerhub - uses: docker/build-push-action@v2 + - name: Build and push versioned images env: RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }} VERSION_WITHOUT_PREFIX: ${{ needs.get-version.outputs.version_without_prefix }} HIGHEST_SEMVER_TAG: ${{ needs.get-version.outputs.highest_semver_tag }} - with: - if: ${VERSION_WITHOUT_PREFIX} == ${HIGHEST_SEMVER_TAG:1} - push: true - context: . - file: ./infra/docker/${{ matrix.component }}/Dockerfile - tags: | - feastdev/feast-${{ matrix.component }}:${{ needs.get-version.outputs.release_version }} - feastdev/feast-${{ matrix.component }}:latest - build-args: | - VERSION=$RELEASE_VERSION - - name: Build and push versioned image to GCR - env: - RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }} run: | - make build-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=$RELEASE_VERSION - make push-${{ matrix.component }}-docker REGISTRY=gcr.io/kf-feast VERSION=$RELEASE_VERSION - source infra/scripts/setup-common-functions.sh - # Build and push semver tagged commits - # Regular expression should match MAJOR.MINOR.PATCH[-PRERELEASE[.IDENTIFIER]] - # eg. v0.7.1 v0.7.2-alpha v0.7.2-rc.1 - SEMVER_REGEX='^v[0-9]+\.[0-9]+\.[0-9]+(-([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$' - if echo "${RELEASE_VERSION}" | grep -P "$SEMVER_REGEX" &>/dev/null ; then - VERSION_WITHOUT_PREFIX=${RELEASE_VERSION:1} - - docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} + docker build --build-arg VERSION=$RELEASE_VERSION \ + -t gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} \ + -t gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} \ + -f infra/docker/${{ matrix.component }}/Dockerfile . + docker push gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} + + echo "Only push to latest tag if tag is the highest semver version $HIGHEST_SEMVER_TAG" + if [ "${VERSION_WITHOUT_PREFIX}" = "${HIGHEST_SEMVER_TAG:1}" ] + then + docker build --build-arg VERSION=$RELEASE_VERSION \ + -t feastdev/feast-${{ matrix.component }}:latest \ + -t feastdev/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} \ + -t gcr.io/kf-feast/feast-${{ matrix.component }}:latest \ + -t gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} \ + -f infra/docker/${{ matrix.component }}/Dockerfile . + docker push feastdev/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} + docker push feastdev/feast-${{ matrix.component }}:latest docker push gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} - - # Also update "latest" image if tagged commit is pushed to stable branch - HIGHEST_SEMVER_TAG=$(get_tag_release -m) - echo "Only push to latest tag if tag is the highest semver version $HIGHEST_SEMVER_TAG" - - if [ "${VERSION_WITHOUT_PREFIX}" = "${HIGHEST_SEMVER_TAG:1}" ] - then - docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:${GITHUB_SHA} gcr.io/kf-feast/feast-${{ matrix.component }}:latest - docker push gcr.io/kf-feast/feast-${{ matrix.component }}:latest - fi + docker push gcr.io/kf-feast/feast-${{ matrix.component }}:latest fi publish-helm-charts: From 97e20f548bdbf3f35aee747cc5fad50a29f94885 Mon Sep 17 00:00:00 2001 From: Terence Date: Thu, 19 Nov 2020 15:22:35 +0800 Subject: [PATCH 8/8] Remove build and just tag Signed-off-by: Terence --- .github/workflows/release.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f4085e4273b..7424d571890 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,15 +89,9 @@ jobs: echo "Only push to latest tag if tag is the highest semver version $HIGHEST_SEMVER_TAG" if [ "${VERSION_WITHOUT_PREFIX}" = "${HIGHEST_SEMVER_TAG:1}" ] then - docker build --build-arg VERSION=$RELEASE_VERSION \ - -t feastdev/feast-${{ matrix.component }}:latest \ - -t feastdev/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} \ - -t gcr.io/kf-feast/feast-${{ matrix.component }}:latest \ - -t gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} \ - -f infra/docker/${{ matrix.component }}/Dockerfile . - docker push feastdev/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} + docker tag feastdev/feast-${{ matrix.component }}:latest gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} + docker tag gcr.io/kf-feast/feast-${{ matrix.component }}:latest gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} docker push feastdev/feast-${{ matrix.component }}:latest - docker push gcr.io/kf-feast/feast-${{ matrix.component }}:${VERSION_WITHOUT_PREFIX} docker push gcr.io/kf-feast/feast-${{ matrix.component }}:latest fi