diff options
| author |   Victor Morales <victor.morales@intel.com> | 2018-06-06 09:00:44 -0700 |
|---|---|---|
| committer | Victor Morales <victor.morales@intel.com> | 2018-06-12 07:34:13 -0700 |
| commit | 079a1b8de9153bd63d95b807456149f49f3a7b66 (patch) | |
| tree | 976f9b9953734c039d9f2017154638979ca53b8b | |
| parent | e49ce24667ac548293c517d3025bedd42fc830a6 (diff) | |
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 <victor.morales@intel.com>
Issue-ID: MULTICLOUD-242
| -rwxr-xr-x[-rw-r--r--] | ocata/docker/build_image.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh index 03b11212..980dffc7 100644..100755 --- 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}" |