From: Zhe Huang <zhehuang@research.att.com>
Date: Fri, 12 Jul 2019 14:47:45 +0000 (+0000)
Subject: Merge "Update docker version"
X-Git-Tag: 0.0.2~64
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=0309475769b27702c8c886411222882da8b519b1;hp=35f4069bf0175d1c03bb3a9ce7fc35ef5fd9397f;p=it%2Fdep.git

Merge "Update docker version"
---

diff --git a/ric-infra/00-Kubernetes/etc/infra.rc b/ric-infra/00-Kubernetes/etc/infra.rc
index 28747f5d..2678776e 100644
--- a/ric-infra/00-Kubernetes/etc/infra.rc
+++ b/ric-infra/00-Kubernetes/etc/infra.rc
@@ -1,5 +1,5 @@
 # modify below for RIC infrastructure (docker-k8s-helm) component versions
-INFRA_DOCKER_VERSION="18.06.1"
+INFRA_DOCKER_VERSION="18.09.7-0ubuntu1~16.04.4"
 INFRA_K8S_VERSION="1.13.3"
 INFRA_CNI_VERSION="0.6.0"
 INFRA_HELM_VERSION="2.12.3"
diff --git a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
index e3a949b0..e1e96150 100644
--- a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
+++ b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh
@@ -121,7 +121,7 @@ KUBECNIV=$(cat /opt/config/k8s_cni_version.txt)
 
 KUBEVERSION="${KUBEV}-00"
 CNIVERSION="${KUBECNIV}-00"
-DOCKERVERSION="${DOCKERV}-0ubuntu1.2~16.04.1"
+DOCKERVERSION="${DOCKERV}"
 curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
 echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list
 
@@ -130,7 +130,7 @@ apt-get update
 apt-get install -y linux-image-4.15.0-45-lowlatency curl jq netcat docker.io=${DOCKERVERSION}
 apt-get install -y kubernetes-cni=${CNIVERSION}
 apt-get install -y --allow-unauthenticated kubeadm=${KUBEVERSION} kubelet=${KUBEVERSION} kubectl=${KUBEVERSION}
-apt-mark hold kubernetes-cni kubelet kubeadm kubectl
+apt-mark hold docker.io kubernetes-cni kubelet kubeadm kubectl
 
 
 # test access to k8s docker registry