publish Docker image for non release builds as well

fixes #3570

Author: Vladimir Kotal

dev/docker.sh

@@ -22,33 +22,36 @@ fi
 if [[ -n $OPENGROK_TAG ]]; then
 	VERSION="$OPENGROK_TAG"
 	VERSION_SHORT=$( echo $VERSION | cut -d. -f1,2 )
-else
-	VERSION="latest"
-	VERSION_SHORT="latest"
-fi
 
-if [[ -z $VERSION ]]; then
-	echo "empty VERSION"
-	exit 1
-fi
+	if [[ -z $VERSION ]]; then
+		echo "empty VERSION"
+		exit 1
+	fi
 
-if [[ -z $VERSION_SHORT ]]; then
-	echo "empty VERSION_SHORT"
-	exit 1
-fi
+	if [[ -z $VERSION_SHORT ]]; then
+		echo "empty VERSION_SHORT"
+		exit 1
+	fi
+
+	echo "Version: $VERSION"
+	echo "Short version: $VERSION_SHORT"
 
-echo "Version: $VERSION"
-echo "Short version: $VERSION_SHORT"
+	TAGS="$VERSION $VERSION_SHORT latest"
 
-# Build the image.
-echo "Building docker image"
-docker build \
-    -t $IMAGE:$VERSION \
-    -t $IMAGE:$VERSION_SHORT \
-    -t $IMAGE:latest .
+	echo "Building docker image for release ($TAGS)"
+	docker build \
+	    -t $IMAGE:$VERSION \
+	    -t $IMAGE:$VERSION_SHORT \
+	    -t $IMAGE:latest .
+else
+	TAGS="master"
+
+	echo "Building docker image for master"
+	docker build -t $IMAGE:master .
+fi
 
 #
-# Run the image in container. This is not strictly needed however
+# Run the image in a container. This is not strictly needed however
 # serves as additional test in automatic builds.
 #
 echo "Running the image in container"
@@ -67,12 +70,6 @@ if [[ "$OPENGROK_REPO_SLUG" != "oracle/opengrok" ]]; then
 	exit 0
 fi
 
-# Allow Docker push for release builds only.
-if [[ -z $OPENGROK_TAG ]]; then
-	echo "OPENGROK_TAG is empty"
-	exit 0
-fi
-
 if [[ -z $DOCKER_USERNAME ]]; then
 	echo "DOCKER_USERNAME is empty"
 	exit 1
@@ -84,12 +81,12 @@ if [[ -z $DOCKER_PASSWORD ]]; then
 fi
 
 # Publish the image to Docker hub.
-if [ -n "$DOCKER_PASSWORD" -a -n "$DOCKER_USERNAME" -a -n "$VERSION" ]; then
+if [ -n "$DOCKER_PASSWORD" -a -n "$DOCKER_USERNAME" -a -n "$TAGS" ]; then
 	echo "Logging into Docker Hub"
 	echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
 	# All the tags need to be pushed individually:
-	for tag in $VERSION $VERSION_SHORT latest; do
+	for tag in $TAGS; do
 		echo "Pushing Docker image for tag $tag"
 		docker push $IMAGE:$tag
 	done
@@ -120,15 +117,18 @@ push_readme() {
 	fi
 }
 
-TOKEN=$(curl -s -H "Content-Type: application/json" -X POST \
-    -d '{"username": "'${DOCKER_USERNAME}'", "password": "'${DOCKER_PASSWORD}'"}' \
-    ${API_URL}/users/login/ | jq -r .token)
-if [[ -z $TOKEN ]]; then
-	echo "Cannot get auth token to publish the README file"
-	exit 1
-fi
+# Update README and badge only for release builds.
+if [[ -n $OPENGROK_TAG ]]; then
+	TOKEN=$(curl -s -H "Content-Type: application/json" -X POST \
+	    -d '{"username": "'${DOCKER_USERNAME}'", "password": "'${DOCKER_PASSWORD}'"}' \
+	    ${API_URL}/users/login/ | jq -r .token)
+	if [[ -z $TOKEN ]]; then
+		echo "Cannot get auth token to publish the README file"
+		exit 1
+	fi
 
-push_readme "${IMAGE}" "${TOKEN}" "docker/README.md"
+	push_readme "${IMAGE}" "${TOKEN}" "docker/README.md"
 
-# update Microbadger
-curl -s -X POST https://hooks.microbadger.com/images/opengrok/docker/pSastb42Ikfn2dF5llR54sSPqbQ=
+	# update Microbadger
+	curl -s -X POST https://hooks.microbadger.com/images/opengrok/docker/pSastb42Ikfn2dF5llR54sSPqbQ=
+fi