Update ccsdk/distribution for ODL Argon

[ccsdk/distribution.git] / alpine / java17 / src / main / docker / Dockerfile

diff --git a/alpine/java17/src/main/docker/Dockerfile b/alpine/java17/src/main/docker/Dockerfile
index 192d618..5018e1a 100644 (file)
--- a/alpine/java17/src/main/docker/Dockerfile
+++ b/alpine/java17/src/main/docker/Dockerfile
@@ -3,16 +3,27 @@ FROM ${base.image}:${base.image.version}
 MAINTAINER CCSDK  Team (onap-ccsdk@lists.onap.org)
 USER root
 
-ARG HTTP_PROXY
-ARG HTTPS_PROXY
+ARG http_proxy
+ARG https_proxy
+ARG no_proxy
 
-ENV HTTP_PROXY  ${HTTP_PROXY}
-ENV http_proxy  ${HTTP_PROXY}
-ENV HTTPS_PROXY ${HTTPS_PROXY}
-ENV https_proxy ${HTTPS_PROXY}
+ENV HTTP_PROXY $http_proxy
+ENV http_proxy $http_proxy
+ENV HTTPS_PROXY $https_proxy
+ENV https_proxy $https_proxy
+ENV NO_PROXY $no_proxy
+ENV no_proxy $no_proxy
 
 ENV JAVA_HOME /opt/java/openjdk
 
+# Copy any certs
+COPY *.md *.pem /etc/ssl/certs/
+
+# Install certs
+RUN update-ca-certificates
+
+RUN echo "http_proxy = $http_proxy" && echo "https_proxy = $https_proxy" && echo "no_proxy = $no_proxy" &&  echo "HTTP_PROXY = $HTTP_PROXY" &&  echo "HTTPS_PROXY = $HTTPS_PROXY" && echo "NO_PROXY = $NO_PROXY"
+
 # Add tools needed for OpenDaylight
 RUN apk update && apk --no-cache add sudo bash iputils openssl git mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss