Cleaner build method

.github/workflows/deploy-front.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Build the image on Cloud Build
         run: |
           chmod +x ./k8s/cloud-build.sh
-          ./k8s/cloud-build.sh front
+          ./k8s/cloud-build.sh front ./front/Dockerfile ../
 
       - name: Deploy the image on Kubernetes
         run: |

k8s/cloud-build.sh

@@ -1,10 +1,11 @@
 #!/bin/sh
 # first arg : name of image to build
-# second arg (optional) : working directory. If not provided, it defaults to "../$1"
+# second arg: path to the Dockerfile, relative to the resolved WORKING_DIR.
+# thid arg (optional) : working directory. If not provided, it defaults to "../$1"
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
-WORKING_DIR="${2:-${SCRIPT_DIR}/../$1}"
+WORKING_DIR="${3:-${SCRIPT_DIR}/../$1}"
 
 # Change the current working directory to the directory in which to build the image
 cd "$WORKING_DIR"
@@ -14,4 +15,4 @@ echo "Current working directory is $(pwd)"
 
 # Start the build and get its ID
 echo "Starting build..."
-BUILD_ID=$(gcloud builds submit --quiet --config "${SCRIPT_DIR}/cloudbuild.yaml" --substitutions=SHORT_SHA=$(git rev-parse --short HEAD),_IMAGE_NAME=$1 --format='value(id)' ../)
+BUILD_ID=$(gcloud builds submit --quiet --config "${SCRIPT_DIR}/cloudbuild.yaml" --substitutions=SHORT_SHA=$(git rev-parse --short HEAD),_IMAGE_NAME=$1,DOCKERFILE_PATH=$2 --format='value(id)' .)

k8s/cloudbuild.yaml

@@ -10,7 +10,7 @@ steps:
       - gcr.io/$PROJECT_ID/${_IMAGE_NAME}-image:latest
       - --push
       - -f
-      - ./front/Dockerfile
+      - ${DOCKERFILE_PATH}
       - .
     secretEnv: ["DEPOT_TOKEN"]