X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=7a5e376812e09b3754f8bb30d57305276e4276f6;hb=62191f4e3c7375e896aa8429c946d3fb42b727fc;hp=81524a978fd9cc24410e15099a66a790453ee545;hpb=1d5c221862067b3b5b6e0555dcc4eb6c34e9a9f9;p=osm%2Fdevops.git

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 81524a97..7a5e3768 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -20,17 +20,15 @@ FROM ubuntu:18.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.0-1ubuntu2.3 \
-    python3=3.6.7-1~18.04 \
-    python3-dev=3.6.7-1~18.04 \
-    python3-setuptools=39.0.1-2 \
-    curl=7.58.0-2ubuntu3.13 && \
-    python3 -m easy_install pip==21.0.1
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    apt-transport-https=1.6.12ubuntu0.2 \
-    gnupg2=2.2.4-1ubuntu1.4 \
-    openssh-client
+    gcc=4:7.4.* \
+    python3=3.6.* \
+    python3-dev=3.6.* \
+    python3-setuptools=39.0.* \
+    curl=7.58.* \
+    apt-transport-https=1.6.* \
+    gnupg2=2.2.* \
+    openssh-client=1:7.* && \
+    python3 -m easy_install pip==21.0.1 setuptools==51.0.0
 
 RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
     && echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
@@ -68,10 +66,10 @@ RUN pip3 install \
 FROM ubuntu:18.04
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    ca-certificates
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    python3-minimal=3.6.* \
+    ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
 
 COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
 COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages  /usr/local/lib/python3.6/dist-packages
@@ -85,6 +83,8 @@ COPY --from=INSTALL /usr/bin/ssh /usr/bin/ssh
 COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/
 COPY --from=INSTALL /lib/x86_64-linux-gnu/ /lib/x86_64-linux-gnu/
 
+COPY scripts/ scripts/
+
 ########################################################################
 
 # Used for local storage
@@ -129,6 +129,7 @@ ENV OSMLCM_VCA_JUJUPATH    /usr/local/bin/juju
 
 # helm
 ENV OSMLCM_VCA_STABLEREPOURL https://charts.helm.sh/stable
+# ENV OSMLCM_VCA_HELM_CA_CERTS <ca-cert>
 
 # logs
 # ENV OSMLCM_GLOBAL_LOGFILE  /app/log/lcm.log
@@ -139,5 +140,5 @@ HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \
 
 
 # Run app.py when the container launches
-CMD python3 -m osm_lcm.lcm
+CMD [ "/bin/bash", "scripts/start.sh" ]