X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=helm-manager%2FDockerfile;h=b50767cfb06e29bafe40af4db192a9b2604d497a;hb=dfff24a65d219ce3985edbf744b034d1882e452f;hp=b9283c09fd82c67a562d3641412b461b5f8cc69e;hpb=9cd4d7948e24a7f77b2c207c4f37999878373260;p=nonrtric.git

diff --git a/helm-manager/Dockerfile b/helm-manager/Dockerfile
index b9283c09..b50767cf 100644
--- a/helm-manager/Dockerfile
+++ b/helm-manager/Dockerfile
@@ -15,33 +15,51 @@
 #  ============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
-RUN apt-get install -y curl
+FROM openjdk:11-jre-slim
 
 #Install helm
-RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
-RUN chmod 700 get_helm.sh
-RUN ./get_helm.sh
+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
 
 RUN mv ./kubectl /usr/local/bin/kubectl
 
-# Copy app config and app jar
-WORKDIR /opt/app/helm-manager/src/main/resources/config
-
-COPY config/KubernetesParticipantConfig.json .
+WORKDIR /etc/app/helm-manager
 COPY config/application.yaml .
 
 WORKDIR /opt/app/helm-manager
 COPY target/app.jar app.jar
 
-CMD [ "java", "-jar", "app.jar" ]
+ARG user=nonrtric
+ARG group=nonrtric
+
+RUN groupadd $group && \
+    useradd -r -g $group $user
+RUN chown -R $user:$group /opt/app/helm-manager
+RUN chown -R $user:$group /etc/app/helm-manager
+
+RUN mkdir /var/helm-manager-service
+RUN chown -R $user:$group /var/helm-manager-service
+
+RUN mkdir /home/$user
+RUN chown -R $user:$group /home/$user
+
+USER $user
+
+CMD [ "java", "-jar", "app.jar", "--spring.config.location=optional:file:/etc/app/helm-manager/"]