summaryrefslogtreecommitdiffstats
path: root/jjb/releng/opnfv-docker.sh
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2017-09-12 14:25:57 -0400
committerAric Gardner <agardner@linuxfoundation.org>2017-09-13 16:55:01 +0000
commitc135a795c8fb8e7e6952fa3a8702e765cef7e584 (patch)
treec576083099f26a8dd0081e2d9cc62de0314558b4 /jjb/releng/opnfv-docker.sh
parentf675cd5e395e4d48d9ad895f5eb2f4a8b6098b13 (diff)
Optional Architecture Specific Push
Enables optional argument to specify the architecture to use when building and pushing the image. If project defines it, the arch is added to the docker version like so: arch-version. This matches the tag convention used by multiarch/alpine. Change-Id: I699c2aba05c55291b5f8c48bcc1daacceae6154b JIRA: STORPERF-210 Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'jjb/releng/opnfv-docker.sh')
-rw-r--r--jjb/releng/opnfv-docker.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index 0de3df28e..6ca8e374c 100644
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -89,11 +89,18 @@ if [[ -n "${COMMIT_ID-}" && -n "${RELEASE_VERSION-}" ]]; then
BUILD_BRANCH=$COMMIT_ID
fi
+ARCH_BUILD_ARG=""
+if [[ -n "${ARCH_TAG}" ]]; then
+ DOCKER_TAG=${ARCH_TAG}-${DOCKER_TAG}
+ ARCH_BUILD_ARG="--build-arg ARCH=${ARCH_TAG}"
+fi
+
# Start the build
echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG"
echo "--------------------------------------------------------"
echo
cmd="docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BUILD_BRANCH
+ $ARCH_BUILD_ARG
-f $DOCKERFILE ."
echo ${cmd}