Push image build in from PR

fabric8-services · Feb 9, 2018 · fceb724 · fceb724
1 parent f63b70e
commit fceb724
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -48,6 +48,7 @@ push: image ## Pushes the container image to the registry
 	docker push $(REGISTRY_URL):latest
 	docker tag $(REGISTRY_URL):latest $(REGISTRY_URL):$(IMAGE_TAG)
 	docker push $(REGISTRY_URL):$(IMAGE_TAG)
+	echo "Pushed: $(REGISTRY_URL):$(IMAGE_TAG)"
 
 tools: tools.timestamp
 

diff --git a/cico_build_deploy.sh b/cico_build_deploy.sh
@@ -12,7 +12,7 @@ set -e
 #   None
 ###################################################################################
 function setup_build_environment() {
-    [ -f jenkins-env ] && cat jenkins-env | grep -e GIT -e DEVSHIFT -e JOB_NAME > inherit-env
+    [ -f jenkins-env ] && cat jenkins-env | grep -e GIT -e DEVSHIFT -e JOB_NAME -e ghprbPullId > inherit-env
     [ -f inherit-env ] && . inherit-env
 
     # We need to disable selinux for now, XXX
@@ -64,4 +64,7 @@ make all
 if [[ "$JOB_NAME" = "devtools-fabric8-jenkins-proxy-build-master" ]]; then
     TAG=$(echo ${GIT_COMMIT} | cut -c1-${DEVSHIFT_TAG_LEN})
     make push REGISTRY_USER=${DEVSHIFT_USERNAME} REGISTRY_PASSWORD=${DEVSHIFT_PASSWORD} IMAGE_TAG=${TAG}
-fi
+elif [[ "$JOB_NAME" = "devtools-fabric8-jenkins-proxy" ]]; then
+    TAG="PR${ghprbPullId}"
+    make push REGISTRY_USER=${DEVSHIFT_USERNAME} REGISTRY_PASSWORD=${DEVSHIFT_PASSWORD} IMAGE_TAG=${TAG}
+fi