From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Wed, 24 Jan 2018 17:10:04 +0000 (-0500)
Subject: Add missing update of config-init dockerfile
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=9459a4cd3fb347168a2eafd8e3998f57775c55a3;p=oom.git

Add missing update of config-init dockerfile

Change-Id: Ic7e6c7f381489de1ee47f6050b48afbd0434cc82
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Issue-ID: OOM-608
---

diff --git a/kubernetes/config/docker/init/Dockerfile b/kubernetes/config/docker/init/Dockerfile
index b6be90b247..103f3e4250 100644
--- a/kubernetes/config/docker/init/Dockerfile
+++ b/kubernetes/config/docker/init/Dockerfile
@@ -10,6 +10,12 @@ RUN apt-get update
 RUN apt-get install -y openssl vim-common
 RUN mkdir -p /opt/config/src/
 
+# Instal kubectl commands
+RUN apt -y install curl
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
+RUN chmod +x ./kubectl
+RUN mv ./kubectl /usr/local/bin/kubectl
+
 COPY onap-cfg.tar.gz /tmp/
 RUN tar -zxvf /tmp/onap-cfg.tar.gz -C /opt/config/src/
 COPY config-init.sh /root/config-init.sh
diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh
index 8eebab1755..c1eaf32ab1 100755
--- a/kubernetes/config/docker/init/config-init.sh
+++ b/kubernetes/config/docker/init/config-init.sh
@@ -185,12 +185,6 @@ SED_CONFIG_STRINGS=( \
 SED_CONFIG_STRING=$(concat_array "${SED_CONFIG_STRINGS[@]}")
 find $SED_CONFIG_PATHS -type f -exec sed -i -e "${SED_CONFIG_STRING}" {} \;
 
-# Instal kubectl commands
-apt -y install curl
-curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl
-chmod +x ./kubectl
-mv ./kubectl /usr/local/bin/kubectl
-
 if [ "$DEPLOY_DCAE" = "true" ]
 then
     SED_CONFIG_PATHS="/config-init/$NAMESPACE/dcaegen2/heat/"