Fix bug 1618 - adding start script to LCM to install CA certificates

[osm/devops.git] / docker / LCM / Dockerfile

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 20688ef..6cb51a2 100644 (file)
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -36,8 +36,8 @@ 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 \
     && apt-get update && apt-get install -y kubectl=1.20.4-00
 
-RUN curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz --output helm-v2.15.2.tar.gz \
-    && tar -zxvf helm-v2.15.2.tar.gz \
+RUN curl https://get.helm.sh/helm-v2.17.0-linux-amd64.tar.gz --output helm-v2.17.0.tar.gz \
+    && tar -zxvf helm-v2.17.0.tar.gz \
     && mv linux-amd64/helm /usr/local/bin/helm \
     && rm -r linux-amd64/
 
@@ -46,10 +46,6 @@ RUN curl https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz --output helm-v3.3.4
     && mv linux-amd64/helm /usr/local/bin/helm3 \
     && rm -r linux-amd64/
 
-RUN curl -L https://launchpad.net/juju/2.7/2.7.6/+download/juju-2.7.6-k8s.tar.xz --output juju-2.7.6-k8s.tar.xz \
-    && tar -xvf juju-2.7.6-k8s.tar.xz \
-    && mv juju /usr/local/bin/juju
-
 
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_LCM_URL
@@ -74,8 +70,7 @@ 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
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install ca-certificates
 
 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
@@ -83,13 +78,14 @@ COPY --from=INSTALL /usr/local/lib/python3.6/dist-packages  /usr/local/lib/pytho
 COPY --from=INSTALL /usr/bin/kubectl /usr/bin/kubectl
 COPY --from=INSTALL /usr/local/bin/helm /usr/local/bin/helm
 COPY --from=INSTALL /usr/local/bin/helm3 /usr/local/bin/helm3
-COPY --from=INSTALL /usr/local/bin/juju /usr/local/bin/juju
 COPY --from=INSTALL /usr/bin/scp /usr/bin/scp
 COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen
 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
@@ -132,6 +128,10 @@ ENV OSMLCM_VCA_HELMPATH    /usr/local/bin/helm
 ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
 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
 # ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
@@ -141,5 +141,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" ]