RIC-966 updating chartmuseum and docker refs

Issue-ID: RIC-966

Signed-off-by: czichy <thoralf.czichy@nokia.com>
Change-Id: Iefe2fa3c8c90153f0436e0d3d28b3fac2b6d44df

diff --git a/bin/install_common_templates_to_helm.sh b/bin/install_common_templates_to_helm.sh
index 09d597c..d7328e4 100755 (executable)
--- a/bin/install_common_templates_to_helm.sh
+++ b/bin/install_common_templates_to_helm.sh
@@ -21,6 +21,14 @@ helm plugin install https://github.com/jdolitsky/helm-servecm
 eval $(helm env |grep HELM_REPOSITORY_CACHE) 
 echo ${HELM_REPOSITORY_CACHE}
 
+# servecm can download chartmuseum binary, but the hardcoded location does not work anymore
+# so, we download it now before starting servecm, so that it's available when servecm
+# tries to start the chartmuseum binary
+curl -LO https://get.helm.sh/chartmuseum-v0.15.0-linux-386.tar.gz
+tar xzvf chartmuseum-v0.15.0-linux-386.tar.gz
+chmod +x ./linux-386/chartmuseum
+cp ./linux-386/chartmuseum /usr/local/bin
+
 nohup helm servecm --port=8879 --context-path=/charts --storage local --storage-local-rootdir $HELM_REPOSITORY_CACHE/local/ <<EOF &
 yes
 EOF

diff --git a/bin/install_k8s_and_helm.sh b/bin/install_k8s_and_helm.sh
index 234e920..0d19590 100755 (executable)
--- a/bin/install_k8s_and_helm.sh
+++ b/bin/install_k8s_and_helm.sh
@@ -64,7 +64,7 @@ start_ipv6_if () {
 KUBEV="1.16.0"
 KUBECNIV="0.7.5"
 HELMV="3.5.4"
-DOCKERV="20.10.12"
+DOCKERV="20.10.21"
 
 echo running ${0}
 while getopts ":k:d:e:n:c" o; do
@@ -170,7 +170,7 @@ elif [[ ${UBUNTU_RELEASE} == 18.* ]]; then
 elif [[ ${UBUNTU_RELEASE} == 20.* ]]; then
   echo "Installing on Ubuntu $UBUNTU_RELEASE (Focal Fossal)"
   if [ ! -z "${DOCKERV}" ]; then
-    DOCKERVERSION="${DOCKERV}-0ubuntu2~20.04.1"  # 20.10.12-0ubuntu2~20.04.1
+    DOCKERVERSION="${DOCKERV}-0ubuntu1~20.04.1"  # 20.10.21-0ubuntu1~20.04.1
   fi
 else
   echo "Unsupported Ubuntu release ($UBUNTU_RELEASE) detected.  Exit."