Merge pull request eclipse-che#657 from redhat-developer/revert-656-r…

…h-che6 Revert "remove ability to override prod docker registry"
Katka92 · Apr 26, 2018 · 7525d5e · 7525d5e
2 parents 55aeb00 + 34af0a9
commit 7525d5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.ci/cico_deploy.sh b/.ci/cico_deploy.sh
@@ -27,9 +27,8 @@ echo "export OSO_DOMAIN=8a09.starter-us-east-2.openshiftapps.com" >> $config_fil
 echo "export OSO_HOSTNAME=mlabuda-jenkins.8a09.starter-us-east-2.openshiftapps.com" >> $config_file
 echo "export CHE_SERVER_DOCKER_IMAGE_TAG=$CHE_SERVER_DOCKER_IMAGE_TAG" >> $config_file
 echo "export NAMESPACE=${NAMESPACE}" >> $config_file
-echo "=== DEBUG === $TARGET"
-if [ "$TARGET" == "rhel" ]; then
-  export REGISTRY="push.registry.devshift.net/osio-prod"
+if [ $TARGET == "rhel" ]; then
+  export REGISTRY=${DOCKER_REGISTRY:-"push.registry.devshift.net/osio-prod"}
 else
   export REGISTRY="push.registry.devshift.net"
 fi

diff --git a/.ci/cico_do_docker_build_tag_push.sh b/.ci/cico_do_docker_build_tag_push.sh
@@ -45,10 +45,9 @@ do
 
   echo "Copying assembly ${distribution} --> ${LOCAL_ASSEMBLY_DIR}"
   cp -r "${distribution}" "${LOCAL_ASSEMBLY_DIR}"
-  echo "=== DEBUG === $TARGET"
-  if [ "$TARGET" == "rhel" ]; then
+  if [ $TARGET == "rhel" ]; then
     export DOCKERFILE="Dockerfile.rhel"
-    export REGISTRY="push.registry.devshift.net/osio-prod"
+    export REGISTRY=${DOCKER_REGISTRY:-"push.registry.devshift.net/osio-prod"}
   else
     export DOCKERFILE="Dockerfile"
     export REGISTRY="push.registry.devshift.net"