Changed hm Dockerfile to multistage build

Corrected image tag

Issue-ID: NONRTRIC-573

Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I3270d85e0534890664ba366e707bcb10d432ad04

diff --git a/helm-manager/Dockerfile b/helm-manager/Dockerfile
index c7de28a..90164fd 100644 (file)
--- a/helm-manager/Dockerfile
+++ b/helm-manager/Dockerfile
@@ -15,20 +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 and wget
-RUN apt-get update && apt-get install -y --no-install-recommends curl wget && rm -rf /var/lib/apt/lists/*
+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/helm-manager.yaml b/helm-manager/helm-manager.yaml
index f372b30..093752e 100644 (file)
--- 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.0.0-SNAPSHOT
     imagePullPolicy: Always
     ports:
     - name: http