From be41771edadc473c6a17ac919d19bb4d122c11c1 Mon Sep 17 00:00:00 2001
From: Stefan Dinescu <stefan.dinescu@windriver.com>
Date: Wed, 18 Mar 2020 16:17:07 +0200
Subject: [PATCH] Support for full image paths

Remote clients always pulled their images from docker.io, with
the only thing changing being the tag of the image. Now, the
full image path is configurable.

Change-Id: Ie62a38a28e456681f4fa40762783f7fc4adbbe4f
Story: 2006711
Task: 39093
Signed-off-by: Stefan Dinescu <stefan.dinescu@windriver.com>
---
 remote_cli/README                  | 9 +++++++++
 remote_cli/client_wrapper.sh       | 4 ++--
 remote_cli/docker_image_version.sh | 4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/remote_cli/README b/remote_cli/README
index 9cf8832..db2583f 100644
--- a/remote_cli/README
+++ b/remote_cli/README
@@ -42,6 +42,15 @@ To install the clients on a Linux machine follow these steps:
 
 1.   Untar the provided SDK module tarball
 
+     If you want to use your own docker images for remote-clients or
+     pushed the default images to your own private docker registry,
+     you can edit the PLATFORM_DOCKER_IMAGE and APPLICATION_DOCKER_IMAGE
+     variables in the docker_image_versions.sh file.
+
+     NOTE: If you are pulling images from custom docker registries that require
+           authentication, use the "docker login" command to login to that custom
+           registry, before attempting to run commands for the first time.
+
 2.   Download the openrc file from Horizon.
      Log in to Horizon as the user and tenant that you want to use the
      remote CLIs as, go to:
diff --git a/remote_cli/client_wrapper.sh b/remote_cli/client_wrapper.sh
index 943200b..543fd1f 100755
--- a/remote_cli/client_wrapper.sh
+++ b/remote_cli/client_wrapper.sh
@@ -11,7 +11,7 @@ KUBE_CFG_PATH="/root/.kube/config"
 SHELL_TYPE=$(uname -s)
 
 if [[ "$CONFIG_TYPE" = "platform" ]]; then
-    CLIENT_IMAGE_NAME="docker.io/starlingx/stx-platformclients:${PLATFORM_DOCKER_IMAGE_TAG}"
+    CLIENT_IMAGE_NAME="${PLATFORM_DOCKER_IMAGE}"
     # We only need to configure the kubernetes authentication file on the platform container
     if [[ "${SHELL_TYPE}" == *"CYGWIN"* ]]; then
         # On Windows 10, native docker needs the full windows path, not the UNIX one,
@@ -21,7 +21,7 @@ if [[ "$CONFIG_TYPE" = "platform" ]]; then
         VOLUME_LIST="--volume ${OSC_WORKDIR}:/wd --volume ${K8S_CONFIG_FILE}:${KUBE_CFG_PATH}"
     fi
 else
-    CLIENT_IMAGE_NAME="docker.io/starlingx/stx-openstackclients:${APPLICATION_DOCKER_IMAGE_TAG}"
+    CLIENT_IMAGE_NAME="${APPLICATION_DOCKER_IMAGE}"
     if [[ "${SHELL_TYPE}" == *"CYGWIN"* ]]; then
         VOLUME_LIST="--volume $(cygpath -m ${OSC_WORKDIR}):/wd"
     else
diff --git a/remote_cli/docker_image_version.sh b/remote_cli/docker_image_version.sh
index 56b2784..303810a 100644
--- a/remote_cli/docker_image_version.sh
+++ b/remote_cli/docker_image_version.sh
@@ -1,2 +1,2 @@
-export PLATFORM_DOCKER_IMAGE_TAG="master-centos-stable-latest"
-export APPLICATION_DOCKER_IMAGE_TAG="master-centos-stable-latest"
+export PLATFORM_DOCKER_IMAGE="docker.io/starlingx/stx-platformclients:stx.4.0-v1.0.0"
+export APPLICATION_DOCKER_IMAGE="docker.io/starlingx/stx-openstackclients:master-centos-stable-latest"