From 071c112991c85b5ad4a88b760c79ba7a6875b23e Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 4 Dec 2018 20:23:23 +0100 Subject: [PATCH] dist: include Dockerfile in build context This seems to be necessary on the CI accordin to the error message: ```log unable to prepare context: The Dockerfile (/var/lib/jenkins/workspace/openshift-cincinnati-gh-build-master/dist/Dockerfile) must be within the build context (/var/lib/jenkins/workspace/openshift-cincinnati-gh-build-master/dist/..//release-20181204.181943) ``` --- dist/build_deploy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/build_deploy.sh b/dist/build_deploy.sh index 35a5d6f34..ce03a9887 100755 --- a/dist/build_deploy.sh +++ b/dist/build_deploy.sh @@ -15,6 +15,7 @@ function cleanup() { set +e if [[ ! -n "$KEEP_RELEASE_OUTPUT" ]]; then rm -f ${RELEASE_OUTPUT_DIR}/{graph-builder,policy-engine} + rm -f ${RELEASE_OUTPUT_DIR}/$(basename ${DOCKERFILE_DEPLOY}) rmdir ${RELEASE_OUTPUT_DIR} fi docker_cargo clean @@ -23,9 +24,9 @@ trap cleanup EXIT docker_cargo build --release mkdir $RELEASE_OUTPUT_DIR -cp ${RELEASE_DIR}/{graph-builder,policy-engine} $RELEASE_OUTPUT_DIR/ +cp ${RELEASE_DIR}/{graph-builder,policy-engine} $DOCKERFILE_DEPLOY $RELEASE_OUTPUT_DIR/ -docker build -f $DOCKERFILE_DEPLOY -t "${IMAGE}:${IMAGE_TAG}" $RELEASE_OUTPUT_DIR +docker build -t "${IMAGE}:${IMAGE_TAG}" $RELEASE_OUTPUT_DIR if [[ -n "$QUAY_USER" && -n "$QUAY_TOKEN" ]]; then DOCKER_CONF="$PWD/.docker"