From 78ca7b32f36e4cb3095346262c63f928c54f82d3 Mon Sep 17 00:00:00 2001
From: Ewe Zi Yi <36802364+deadlycoconuts@users.noreply.github.com>
Date: Wed, 16 Aug 2023 10:42:33 +0800
Subject: [PATCH] Add logic check to check for presence of env var before
 activating service account (#358)

---
 engines/pyfunc-ensembler-job/app.Dockerfile     | 3 ++-
 engines/pyfunc-ensembler-service/app.Dockerfile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/engines/pyfunc-ensembler-job/app.Dockerfile b/engines/pyfunc-ensembler-job/app.Dockerfile
index 8882c0fe2..e0944d546 100644
--- a/engines/pyfunc-ensembler-job/app.Dockerfile
+++ b/engines/pyfunc-ensembler-job/app.Dockerfile
@@ -4,7 +4,8 @@ FROM ${BASE_IMAGE}
 
 ARG MODEL_URL
 ARG GOOGLE_APPLICATION_CREDENTIALS
-RUN gcloud auth activate-service-account --key-file=${GOOGLE_APPLICATION_CREDENTIALS}
+# Run docker build using the credentials if provided
+RUN if [[-z "$GOOGLE_APPLICATION_CREDENTIALS"]]; then gcloud auth activate-service-account --key-file=${GOOGLE_APPLICATION_CREDENTIALS}; fi
 RUN gsutil -m cp -r ${MODEL_URL} .
 ARG FOLDER_NAME
 RUN /bin/bash -c ". activate ${CONDA_ENVIRONMENT} && conda env update --name ${CONDA_ENVIRONMENT} --file /${HOME}/${FOLDER_NAME}/conda.yaml"
diff --git a/engines/pyfunc-ensembler-service/app.Dockerfile b/engines/pyfunc-ensembler-service/app.Dockerfile
index 76e304471..3f3b17be7 100644
--- a/engines/pyfunc-ensembler-service/app.Dockerfile
+++ b/engines/pyfunc-ensembler-service/app.Dockerfile
@@ -6,7 +6,8 @@ ARG MODEL_URL
 ARG FOLDER_NAME
 ARG GOOGLE_APPLICATION_CREDENTIALS
 
-RUN gcloud auth activate-service-account --key-file=${GOOGLE_APPLICATION_CREDENTIALS}
+# Run docker build using the credentials if provided
+RUN if [[-z "$GOOGLE_APPLICATION_CREDENTIALS"]]; then gcloud auth activate-service-account --key-file=${GOOGLE_APPLICATION_CREDENTIALS}; fi
 RUN gsutil -m cp -r ${MODEL_URL} .
 
 # Install dependencies required by the user-defined ensembler