From 391e45b91cc90883e97a9949cfe2541a19cf81aa Mon Sep 17 00:00:00 2001 From: Terence Date: Wed, 11 Nov 2020 17:03:30 +0800 Subject: [PATCH 1/2] Fix helm repo addition and dockerhub path context Signed-off-by: Terence --- .github/workflows/release.yml | 2 ++ infra/scripts/sync-helm-charts.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index da82b59aa59..5a4ed853fdb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,6 +80,7 @@ jobs: RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }} with: push: true + context: infra/docker/${{ matrix.component }} file: infra/docker/${{ matrix.component }}/Dockerfile tags: feastdev/feast-${{ matrix.component }}:${{ needs.get-version.outputs.release_version }} build-args: | @@ -93,6 +94,7 @@ jobs: with: if: ${VERSION_WITHOUT_PREFIX} == ${HIGHEST_SEMVER_TAG:1} push: true + context: infra/docker/${{ matrix.component }} file: infra/docker/${{ matrix.component }}/Dockerfile tags: feastdev/feast-${{ matrix.component }}:latest build-args: | diff --git a/infra/scripts/sync-helm-charts.sh b/infra/scripts/sync-helm-charts.sh index 06dfddfb2e1..acb4effe66e 100755 --- a/infra/scripts/sync-helm-charts.sh +++ b/infra/scripts/sync-helm-charts.sh @@ -30,7 +30,7 @@ fi exit_code=0 -helm repo add bitnami bitnami https://charts.bitnami.com/bitnami +helm repo add bitnami https://charts.bitnami.com/bitnami for dir in "$repo_dir"/*; do if helm dep update "$dir" && helm dep build "$dir"; then From 3304b63568f1554b719267a0bcb7a505c3693a0a Mon Sep 17 00:00:00 2001 From: Terence Date: Wed, 11 Nov 2020 18:28:13 +0800 Subject: [PATCH 2/2] Fix env variable access and context Signed-off-by: Terence --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a4ed853fdb..c5409032cd5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,11 +80,11 @@ jobs: RELEASE_VERSION: ${{ needs.get-version.outputs.release_version }} with: push: true - context: infra/docker/${{ matrix.component }} - file: infra/docker/${{ matrix.component }}/Dockerfile + context: . + file: ./infra/docker/${{ matrix.component }}/Dockerfile tags: feastdev/feast-${{ matrix.component }}:${{ needs.get-version.outputs.release_version }} build-args: | - REVISION=${RELEASE_VERSION} + REVISION=$RELEASE_VERSION - name: Build and push latest uses: docker/build-push-action@v2 env: @@ -94,11 +94,11 @@ jobs: with: if: ${VERSION_WITHOUT_PREFIX} == ${HIGHEST_SEMVER_TAG:1} push: true - context: infra/docker/${{ matrix.component }} - file: infra/docker/${{ matrix.component }}/Dockerfile + context: . + file: ./infra/docker/${{ matrix.component }}/Dockerfile tags: feastdev/feast-${{ matrix.component }}:latest build-args: | - REVISION=${RELEASE_VERSION} + REVISION=$RELEASE_VERSION publish-helm-charts: runs-on: ubuntu-latest