Support custom image tags for remote CLI images

As part of creating a distributable tarball or remote CLI
wrapper script, we must also be able to package an exact
version of docker image files to ensure compatibility
between the remote CLI tarball and the distributed ISO and
helm chart.

This change writes the desired image tag in a separate file
that can then be overwritten by the packaging script as
needed.

Change-Id: Iab99486f0a8e697e3cec861ba9a45d9794c21f3a
Closes-bug: 1840133
Depends-on: I156172a6ed208d6fcf9bb8f37182daea73b2856c
Signed-off-by: Stefan Dinescu <stefan.dinescu@windriver.com>
This commit is contained in:
Stefan Dinescu 2019-08-26 15:23:56 +03:00
parent 1a661e5311
commit 1871e51590
3 changed files with 5 additions and 2 deletions

View File

@ -9,11 +9,11 @@
KUBE_CFG_PATH="/root/.kube/config"
if [[ "$CONFIG_TYPE" = "platform" ]]; then
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-platformclients:master-centos-stable-latest"
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-platformclients:${DOCKER_IMAGE_TAG}"
# We only need to configure the kubernetes authentication file on the platform container
VOLUME_LIST="--volume ${OSC_WORKDIR}:/wd --volume ${K8S_CONFIG_FILE}:${KUBE_CFG_PATH}"
else
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-openstackclients:master-centos-stable-latest"
CLIENT_IMAGE_NAME="docker.io/starlingx/stx-openstackclients:${DOCKER_IMAGE_TAG}"
VOLUME_LIST="--volume ${OSC_WORKDIR}:/wd"
fi

View File

@ -11,6 +11,7 @@ RC_FILE="admin-openrc.sh"
CONF_FILE=remote_client_config.sh
ALIAS_FILE=config_aliases.sh
K8S_FILE="temp-kubeconfig"
TAG_FILE=docker_image_version.sh
WORK_DIR='.'
custom_conf_file=0
explicit_client_type=0
@ -134,3 +135,4 @@ if [[ "$CONFIG_TYPE" = "platform" ]]; then
fi
echo "source ${PATH_TO_SCRIPT}/$ALIAS_FILE" >> $CONF_FILE
echo "source ${PATH_TO_SCRIPT}/$TAG_FILE" >> $CONF_FILE

View File

@ -0,0 +1 @@
export DOCKER_IMAGE_TAG="master-centos-stable-latest"