Merge pull request #2320 from bomoko/hotfix/reenables_harbor

Reenables harbor push of OS images
uselagoon · Dec 2, 2020 · 90b8694 · 90b8694
2 parents 4af24a1 + b7cdc17
commit 90b8694
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/images/oc-build-deploy-dind/build-deploy.sh b/images/oc-build-deploy-dind/build-deploy.sh
@@ -47,11 +47,11 @@ DOCKER_REGISTRY_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
 docker login -u=jenkins -p="${DOCKER_REGISTRY_TOKEN}" ${OPENSHIFT_REGISTRY}
 
 INTERNAL_REGISTRY_LOGGED_IN="false"
-# if [ ! -z ${INTERNAL_REGISTRY_URL} ] && [ ! -z ${INTERNAL_REGISTRY_USERNAME} ] && [ ! -z ${INTERNAL_REGISTRY_PASSWORD} ] ; then
-#   if echo "docker login -u '${INTERNAL_REGISTRY_USERNAME}' -p '${INTERNAL_REGISTRY_PASSWORD}' ${INTERNAL_REGISTRY_URL}" | /bin/bash; then
-#     INTERNAL_REGISTRY_LOGGED_IN="true"
-#   fi
-# fi
+if [ ! -z ${INTERNAL_REGISTRY_URL} ] && [ ! -z ${INTERNAL_REGISTRY_USERNAME} ] && [ ! -z ${INTERNAL_REGISTRY_PASSWORD} ] ; then
+  if echo "docker login -u '${INTERNAL_REGISTRY_USERNAME}' -p '${INTERNAL_REGISTRY_PASSWORD}' ${INTERNAL_REGISTRY_URL}" | /bin/bash; then
+    INTERNAL_REGISTRY_LOGGED_IN="true"
+  fi
+fi
 
 DEPLOYER_TOKEN=$(cat /var/run/secrets/lagoon/deployer/token)