Merge pull request #644 from ldorau/Create-separate-Docker-images-for-stable-1.6-branch

Create separate Docker images for stable-1.6 branch

Author: igchor

utils/docker/build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2017-2018, Intel Corporation
+# Copyright 2017-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -73,7 +73,7 @@ else
 	fi
 fi
 
-imageName=${DOCKERHUB_REPO}:${OS}-${OS_VER}
+imageName=${DOCKERHUB_REPO}:1.6-${OS}-${OS_VER}
 containerName=libpmemobj-cpp-${OS}-${OS_VER}
 
 if [[ "$command" == "" ]]; then

utils/docker/images/build-image.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2018, Intel Corporation
+# Copyright 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -62,8 +62,8 @@ if [[ ! -f "Dockerfile.$2" ]]; then
 	exit 1
 fi
 
-# Build a Docker image tagged with ${DOCKERHUB_REPO}:OS-VER
-docker build -t $1:$2 \
+# Build a Docker image tagged with ${DOCKERHUB_REPO}:1.6-OS-VER
+docker build -t $1:1.6-$2 \
 	--build-arg http_proxy=$http_proxy \
 	--build-arg https_proxy=$https_proxy \
 	-f Dockerfile.$2 .

utils/docker/images/push-image.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2018, Intel Corporation
+# Copyright 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -45,7 +45,7 @@ function usage {
 	echo "Usage:"
 	echo "    push-image.sh <OS-VER>"
 	echo "where <OS-VER>, for example, can be 'ubuntu-16.04', provided " \
-		"a Docker image tagged with ${DOCKERHUB_REPO}:ubuntu-16.04 exists " \
+		"a Docker image tagged with ${DOCKERHUB_REPO}:1.6-ubuntu-16.04 exists " \
 		"locally."
 }
 
@@ -55,8 +55,8 @@ if [[ -z "$1" ]]; then
 	exit 1
 fi
 
-# Check if the image tagged with ${DOCKERHUB_REPO}:OS-VER exists locally
-if [[ ! $(docker images -a | awk -v pattern="^${DOCKERHUB_REPO}:$1\$" \
+# Check if the image tagged with ${DOCKERHUB_REPO}:1.6-OS-VER exists locally
+if [[ ! $(docker images -a | awk -v pattern="^${DOCKERHUB_REPO}:1.6-$1\$" \
 	'$1":"$2 ~ pattern') ]]
 then
 	echo "ERROR: wrong argument."
@@ -68,4 +68,4 @@ fi
 docker login -u="$DOCKERHUB_USER" -p="$DOCKERHUB_PASSWORD"
 
 # Push the image to the repository
-docker push ${DOCKERHUB_REPO}:$1
+docker push ${DOCKERHUB_REPO}:1.6-$1

utils/docker/pull-or-rebuild-image.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2019, Intel Corporation
+# Copyright 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -123,8 +123,8 @@ for file in $files; do
 		# repository's master branch, and the Travis build is not
 		# of the "pull_request" type). In that case, create the empty
 		# file.
-		if [[ $TRAVIS_REPO_SLUG == "${GITHUB_REPO}" \
-			&& $TRAVIS_BRANCH == "master" \
+		if [[ "${TRAVIS_REPO_SLUG}" == "${GITHUB_REPO}" \
+			&& ($TRAVIS_BRANCH == stable-* || $TRAVIS_BRANCH == master) \
 			&& $TRAVIS_EVENT_TYPE != "pull_request"
 			&& $PUSH_IMAGE == "1" ]]
 		then
@@ -145,4 +145,4 @@ done
 
 # Getting here means rebuilding the Docker image is not required.
 # Pull the image from Docker Hub.
-docker pull ${DOCKERHUB_REPO}:${OS}-${OS_VER}
+docker pull ${DOCKERHUB_REPO}:1.6-${OS}-${OS_VER}