Plumb through version revision

Author: Stuart Padley

release/linux/docker/pipeline-test.sh

@@ -20,13 +20,15 @@ set -exv
 : "${REPO_ROOT_DIR:=`cd $(dirname $0); cd ../../../; pwd`}"
 
 PACKAGE_VERSION=${CLI_VERSION:=0.0.1}
+PACKAGE_VERSION_REVISION=${CLI_VERSION_REVISION:=1}
 
 BUILD_ARTIFACTSTAGINGDIRECTORY=${BUILD_ARTIFACTSTAGINGDIRECTORY:=${REPO_ROOT_DIR}/output/docker}
 IMAGE_NAME=microsoft/sqlcmd${BUILD_BUILDNUMBER:=''}:latest
-TAR_FILE=${BUILD_ARTIFACTSTAGINGDIRECTORY}/sqlcmd-docker-${PACKAGE_VERSION}.tar
+TAR_FILE=${BUILD_ARTIFACTSTAGINGDIRECTORY}/sqlcmd-docker-${PACKAGE_VERSION}-${PACKAGE_VERSION_REVISION}.tar
 
 echo "=========================================================="
 echo "PACKAGE_VERSION: ${PACKAGE_VERSION}"
+echo "PACKAGE_VERSION_REVISION: ${PACKAGE_VERSION_REVISION}"
 echo "BUILD_ARTIFACTSTAGINGDIRECTORY: ${BUILD_ARTIFACTSTAGINGDIRECTORY}"
 echo "Image name: ${IMAGE_NAME}"
 echo "Docker image file: ${TAR_FILE}"

release/linux/docker/pipeline.sh

@@ -10,7 +10,7 @@
 # Instructions to be invoked under the build CI pipeline in AzureDevOps.
 #
 # Build and save the `sqlcmd` image into the bundle:
-# `docker-sqlcmd-${PACKAGE_VERSION}.tar`
+# `sqlcmd-docker-${PACKAGE_VERSION}.tar`
 #
 # Usage:
 #
@@ -28,16 +28,19 @@ fi
 chmod u+x ${REPO_ROOT_DIR}/sqlcmd
 
 PACKAGE_VERSION=${CLI_VERSION:=0.0.1}
+PACKAGE_VERSION_REVISION=${CLI_VERSION_REVISION:=1}
 
 echo "=========================================================="
 echo "PACKAGE_VERSION: ${PACKAGE_VERSION}"
+echo "PACKAGE_VERSION_REVISION: ${PACKAGE_VERSION_REVISION}"
 echo "IMAGE_NAME: ${IMAGE_NAME}"
 echo "Output location: ${DIST_DIR}"
 echo "=========================================================="
 
 docker build --no-cache \
              --build-arg BUILD_DATE="`date -u +"%Y-%m-%dT%H:%M:%SZ"`" \
              --build-arg PACKAGE_VERSION=${PACKAGE_VERSION} \
+             --build-arg PACKAGE_VERSION_REVISION=${PACKAGE_VERSION_REVISION} \
              --tag ${IMAGE_NAME}:latest \
              ${REPO_ROOT_DIR}
 
@@ -46,7 +49,7 @@ echo "Done - docker build"
 echo "=========================================================="
 
 mkdir -p ${DIST_DIR} || exit 1
-docker save -o "${DIST_DIR}/sqlcmd-docker-${PACKAGE_VERSION}.tar" ${IMAGE_NAME}:latest
+docker save -o "${DIST_DIR}/sqlcmd-docker-${PACKAGE_VERSION}-${PACKAGE_VERSION_REVISION}.tar" ${IMAGE_NAME}:latest
 
 echo "=========================================================="
 echo "Done - docker save"