summaryrefslogtreecommitdiffstats
path: root/jjb/releng/opnfv-docker.sh
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2017-07-11 14:56:31 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-07-24 12:34:55 -0700
commit8267bbb6f9710bbe4ba25913eadd91b4789a7e99 (patch)
tree6bf12ab1eee85917786b059573f85ff61f3e6c9b /jjb/releng/opnfv-docker.sh
parent83fef5968f000a56ecebf21ae9b089a6a39b6e33 (diff)
Multiple Dockerfile Builds per Project
Instead of defining docker build jobs in terms of projects, we define them in terms of dockerrepos. Each dockerrepo is associated with a specific project and may have a seperate Dockerfile (which defaults to 'Dockerfile' if unspecified), and location for files needed by the Dockerfile (default: 'docker'). This should allow for running multiple docker builds out of a single project repository without having to modify the current docker build scripts. The output of this job configuration should match what is currently in Jenkins. Change-Id: I9089d57a0c7cc56be4225b56e96bec56be258f1f Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'jjb/releng/opnfv-docker.sh')
-rw-r--r--jjb/releng/opnfv-docker.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/jjb/releng/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index ebd0c9f3d..0de3df28e 100644
--- a/jjb/releng/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
@@ -54,7 +54,7 @@ if [[ -n "$(docker images | grep $DOCKER_REPO_NAME)" ]]; then
done
fi
-cd $WORKSPACE/docker
+cd $WORKSPACE/$DOCKER_DIR
HOST_ARCH=$(uname -m)
if [ ! -f "${DOCKERFILE}" ]; then
# If this is expected to be a Dockerfile for other arch than x86