From 791583cd1c1cd73e9edde25e8526784b514dfe14 Mon Sep 17 00:00:00 2001
From: Tyler Ward <twardnw@gmail.com>
Date: Tue, 5 Feb 2019 11:43:44 -0800
Subject: [PATCH] #841 - move to after subfolder CD and test for .lagoon.yml
 file

---
 images/oc-build-deploy-dind/build-deploy.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/images/oc-build-deploy-dind/build-deploy.sh b/images/oc-build-deploy-dind/build-deploy.sh
index 19f24e1dda..0a542f81f5 100755
--- a/images/oc-build-deploy-dind/build-deploy.sh
+++ b/images/oc-build-deploy-dind/build-deploy.sh
@@ -18,14 +18,6 @@ else
   /oc-build-deploy/scripts/git-checkout-pull.sh "$SOURCE_REPOSITORY" "$GIT_REF"
 fi
 
-INJECT_GIT_SHA=$(cat .lagoon.yml | shyaml get-value environment_variables.git_sha false)
-if [ "$INJECT_GIT_SHA" == "true" ]
-then
-  LAGOON_GIT_SHA=`git rev-parse HEAD`
-else
-  LAGOON_GIT_SHA="0000000000000000"
-fi
-
 if [[ -n "$SUBFOLDER" ]]; then
   cd $SUBFOLDER
 fi
@@ -34,6 +26,14 @@ if [ ! -f .lagoon.yml ]; then
   echo "no .lagoon.yml file found"; exit 1;
 fi
 
+INJECT_GIT_SHA=$(cat .lagoon.yml | shyaml get-value environment_variables.git_sha false)
+if [ "$INJECT_GIT_SHA" == "true" ]
+then
+  LAGOON_GIT_SHA=`git rev-parse HEAD`
+else
+  LAGOON_GIT_SHA="0000000000000000"
+fi
+
 DOCKER_REGISTRY_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
 
 docker login -u=jenkins -p="${DOCKER_REGISTRY_TOKEN}" ${OPENSHIFT_REGISTRY}