From 84113af10c575d4327b10099d09e6e4858f9c8d9 Mon Sep 17 00:00:00 2001 From: Yossi Tamari Date: Mon, 12 Feb 2024 11:36:11 -0800 Subject: [PATCH] fix: changed build-context to list --- .github/workflows/build-ess-backend.yml | 2 +- .github/workflows/build-registrants-portal.yml | 2 +- .github/workflows/build-responders-portal.yml | 2 +- .github/workflows/build-template.yml | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-ess-backend.yml b/.github/workflows/build-ess-backend.yml index 68d035b0c..5973cce08 100644 --- a/.github/workflows/build-ess-backend.yml +++ b/.github/workflows/build-ess-backend.yml @@ -26,7 +26,7 @@ jobs: uses: ./.github/workflows/build-template.yml with: IMAGE_CONTEXT: ess/src/API - BUILD_CONTEXT: "['shared=../../../shared/src']" + BUILD_CONTEXT: "shared=../../../shared/src" IMAGE_FILE: ess/src/API/Dockerfile IMAGE_NAME: ess-backend REGISTRY: ${{ vars.DOCKER_REGISTRY }} diff --git a/.github/workflows/build-registrants-portal.yml b/.github/workflows/build-registrants-portal.yml index b731eaa6d..7639c6077 100644 --- a/.github/workflows/build-registrants-portal.yml +++ b/.github/workflows/build-registrants-portal.yml @@ -28,7 +28,7 @@ jobs: uses: ./.github/workflows/build-template.yml with: IMAGE_CONTEXT: registrants/src/API - BUILD_CONTEXT: "['shared=../../../shared/src']" + BUILD_CONTEXT: "shared=../../../shared/src" IMAGE_FILE: registrants/src/API/Dockerfile IMAGE_NAME: registrants-portal-api REGISTRY: ${{ vars.DOCKER_REGISTRY }} diff --git a/.github/workflows/build-responders-portal.yml b/.github/workflows/build-responders-portal.yml index b17b8b1ef..450bef061 100644 --- a/.github/workflows/build-responders-portal.yml +++ b/.github/workflows/build-responders-portal.yml @@ -28,7 +28,7 @@ jobs: uses: ./.github/workflows/build-template.yml with: IMAGE_CONTEXT: responders/src/API - BUILD_CONTEXT: "['shared=../../../shared/src']" + BUILD_CONTEXT: "shared=../../../shared/src" IMAGE_FILE: responders/src/API/Dockerfile IMAGE_NAME: responders-portal-api REGISTRY: ${{ vars.DOCKER_REGISTRY }} diff --git a/.github/workflows/build-template.yml b/.github/workflows/build-template.yml index af173a831..5c74026a5 100644 --- a/.github/workflows/build-template.yml +++ b/.github/workflows/build-template.yml @@ -9,7 +9,7 @@ on: BUILD_CONTEXT: required: false type: string - default: "[]" + default: "" IMAGE_FILE: required: true type: string @@ -67,8 +67,7 @@ jobs: uses: docker/build-push-action@v5 with: context: ${{ inputs.IMAGE_CONTEXT }} - build-contexts: | - ${{ fromJson(inputs.BUILD_CONTEXT) }} + build-contexts: ${{ inputs.BUILD_CONTEXT }} file: ${{ inputs.IMAGE_FILE }} push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }}