From 9fd973e497db62e40a7a96b3232f5dc4104ce115 Mon Sep 17 00:00:00 2001 From: Dobroslaw Zybort Date: Mon, 18 Feb 2019 11:16:47 +0100 Subject: [PATCH] Use global job for building docker image Change-Id: I4a2a3b28ed2aa7f227706153ac94f1de25e2609a Story: 2001694 Task: 23213 --- .zuul.yaml | 1 + docker/build_image.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 30b67766..c594fb87 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -85,6 +85,7 @@ jobs: - monascalog-python2-tempest - monascalog-python3-tempest + - docker-build-monasca-service gate: queue: monasca jobs: diff --git a/docker/build_image.sh b/docker/build_image.sh index 0f54b839..e997515b 100755 --- a/docker/build_image.sh +++ b/docker/build_image.sh @@ -44,6 +44,10 @@ set -eo pipefail # Exit the script if any statement returns error. # to provide it as in the following example: # $ ./build_image.sh master master refs/changes/19/595719/3 +# Go to folder with Docker files. +REAL_PATH=$(python -c "import os,sys; print(os.path.realpath('$0'))") +cd "$(dirname "$REAL_PATH")/../docker/" + [ -z "$DOCKER_IMAGE" ] && \ DOCKER_IMAGE=$(\grep DOCKER_IMAGE Dockerfile | cut -f2 -d"=")