Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update image tag & minor fix in docker-compose file"
[nonrtric.git]
/
helm-manager
/
Dockerfile
diff --git
a/helm-manager/Dockerfile
b/helm-manager/Dockerfile
index
b9283c0
..
5e96b60
100644
(file)
--- a/
helm-manager/Dockerfile
+++ b/
helm-manager/Dockerfile
@@
-15,33
+15,35
@@
# ============LICENSE_END=================================================
#
# ============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
-ARG JAR
+#Get kubectl
+RUN curl -Lo /tmp/kubectl https://dl.k8s.io/release/v1.20.2/bin/linux/amd64/kubectl
-#Install curl
-RUN apt-get update
-RUN apt-get install -y curl
+
+FROM openjdk:11-jre-slim
#Install helm
#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 .
-#Install kubectl and configure
-RUN curl -LO https://dl.k8s.io/release/v1.20.2/bin/linux/amd64/kubectl
+RUN tar -zxvf helm.tar.gz
+
+RUN mv linux-amd64/helm /usr/local/bin/helm
+
+#Install kubectl
+COPY --from=build /tmp/kubectl .
RUN chmod +x ./kubectl
RUN mv ./kubectl /usr/local/bin/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
COPY config/application.yaml .
WORKDIR /opt/app/helm-manager
COPY target/app.jar app.jar
-CMD [ "java", "-jar", "app.jar"
]
+CMD [ "java", "-jar", "app.jar"
, "--spring.config.location=optional:file:/etc/app/helm-manager/"
]