From 079a1b8de9153bd63d95b807456149f49f3a7b66 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Wed, 6 Jun 2018 09:00:44 -0700 Subject: Fix project environment The PROJECT environment seems to be provided by Jenkins job, as result that the default "openstack" value is used during the creation of the image. This behaviour causes different names. This change fixes the default value for the PROJECT enviroment variable. Change-Id: Ice521ecf58b4fe111553561e60dae92172248025 Signed-off-by: Victor Morales Issue-ID: MULTICLOUD-242 --- ocata/docker/build_image.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 ocata/docker/build_image.sh (limited to 'ocata/docker/build_image.sh') diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh old mode 100644 new mode 100755 index 03b11212..980dffc7 --- a/ocata/docker/build_image.sh +++ b/ocata/docker/build_image.sh @@ -7,7 +7,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" VERSION="1.2.0-SNAPSHOT" STAGING="1.2.0-STAGING" -IMAGE_NAME="${DOCKER_REPOSITORY:-"nexus3.onap.org:10003"}/${ORG:-"onap"}/${PROJECT:-"multicloud"}/${IMAGE:-"openstack-ocata"}" +OS_VERSION="ocata" +IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}" if [ $HTTP_PROXY ]; then BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" -- cgit 1.2.3-korg