feast-dev
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 20 additions & 36 deletions b/‎.github/workflows/release.yml‎
Lines changed: 20 additions & 36 deletions
@@ -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: