Skip to content

Commit c500a95

Browse files
committed
add ability to specify another container name prefix
Change-Id: I73fc20b40d2ca391c6adee4840347f090226cc34
1 parent a920195 commit c500a95

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

containers/build.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ fi
4343

4444
log "Target platform: $LINUX_DISTR:$LINUX_DISTR_VER"
4545
log "External Web Cache: $SITE_MIRROR"
46+
log "Containers name prefix: $CONTAINER_NAME_PREFIX"
4647
log "Contrail container tag: $CONTRAIL_CONTAINER_TAG"
4748
log "Contrail registry: $CONTRAIL_REGISTRY"
4849
log "Contrail repository: $CONTRAIL_REPOSITORY"
@@ -77,7 +78,7 @@ function process_container() {
7778
# use CONTRAIL_CONTAINER_NAME for build the only conainer
7879
if [[ -z "${CONTRAIL_CONTAINER_NAME}" ]] ; then
7980
local container_name=`echo ${dir#"./"} | tr "/" "-"`
80-
local container_name="contrail-${container_name}"
81+
local container_name="${CONTAINER_NAME_PREFIX}-${container_name}"
8182
else
8283
local container_name=${CONTRAIL_CONTAINER_NAME}
8384
fi

parse-env.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ else
6161
export OPENSTACK_VERSION=${OPENSTACK_VERSION:-'queens'}
6262
fi
6363

64-
# CONTRAIL_VERSION is depricated.
64+
export CONTAINER_NAME_PREFIX=${CONTAINER_NAME_PREFIX:-'contrail'}
65+
# CONTRAIL_VERSION is deprecated.
6566
# For Compatibility with Juniper CI. Will be removed.
6667
[ -z "$CONTRAIL_CONTAINER_TAG" ] && [ -n "$CONTRAIL_VERSION" ] && CONTRAIL_CONTAINER_TAG=$CONTRAIL_VERSION
6768
export CONTRAIL_CONTAINER_TAG=${CONTRAIL_CONTAINER_TAG:-'dev'}

0 commit comments

Comments
 (0)