From a439ccbb33c1958fc31f7fa4928a6d46f0d84a2d Mon Sep 17 00:00:00 2001
From: BjornMagnussonXA <bjorn.magnusson@est.tech>
Date: Tue, 14 Sep 2021 14:44:08 +0200
Subject: [PATCH] Changed hm Dockerfile to multistage build

Corrected/updated image tags

Issue-ID: NONRTRIC-573

Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I73c84fde48c524f3b422d00975c4008d415a7004
---
 helm-manager/Dockerfile        | 21 +++++++++++++--------
 helm-manager/docker-hm.sh      |  2 +-
 helm-manager/helm-manager.yaml |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/helm-manager/Dockerfile b/helm-manager/Dockerfile
index 96a58319..90164fd7 100644
--- a/helm-manager/Dockerfile
+++ b/helm-manager/Dockerfile
@@ -15,21 +15,26 @@
 #  ============LICENSE_END=================================================
 #
 
-FROM openjdk:11-jre-slim
+FROM curlimages/curl:7.78.0 AS build
+
+#Get helm
+RUN curl -Lo /tmp/helm.tar.gz  https://get.helm.sh/helm-v3.6.1-linux-amd64.tar.gz
+
+#Get kubectl
+RUN curl -Lo /tmp/kubectl  https://dl.k8s.io/release/v1.20.2/bin/linux/amd64/kubectl
 
-ARG JAR
 
-#Install curl
-RUN apt-get update && apt-get install -y curl \
-    wget
+FROM openjdk:11-jre-slim
 
 #Install helm
-RUN wget -O helm.tar.gz https://get.helm.sh/helm-v3.6.1-linux-amd64.tar.gz
+COPY --from=build /tmp/helm.tar.gz .
+
 RUN tar -zxvf helm.tar.gz
+
 RUN mv linux-amd64/helm /usr/local/bin/helm
 
-#Install kubectl and configure
-RUN curl -LO https://dl.k8s.io/release/v1.20.2/bin/linux/amd64/kubectl
+#Install kubectl
+COPY --from=build /tmp/kubectl .
 
 RUN chmod +x ./kubectl
 
diff --git a/helm-manager/docker-hm.sh b/helm-manager/docker-hm.sh
index c98b22a9..e51b5318 100755
--- a/helm-manager/docker-hm.sh
+++ b/helm-manager/docker-hm.sh
@@ -31,4 +31,4 @@ docker run \
     -v ~/.cache/helm:/root/.cache/helm \
     -v $(pwd)/config/KubernetesParticipantConfig.json:/opt/app/helm-manager/src/main/resources/config/KubernetesParticipantConfig.json \
     -v $(pwd)/config/application.yaml:/opt/app/helm-manager/src/main/resources/config/application.yaml \
-    nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-helm-manager:1.0.0-SNAPSHOT
\ No newline at end of file
+    nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-helm-manager:1.1.0-SNAPSHOT
diff --git a/helm-manager/helm-manager.yaml b/helm-manager/helm-manager.yaml
index f372b301..5a3465c9 100644
--- a/helm-manager/helm-manager.yaml
+++ b/helm-manager/helm-manager.yaml
@@ -49,7 +49,7 @@ spec:
   serviceAccountName: helm-manager-sa
   containers:
   - name: helmmanagerservice
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-helm-manager:1.0.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-helm-manager:1.1.0-SNAPSHOT
     imagePullPolicy: Always
     ports:
     - name: http
-- 
2.16.6