X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=8215fd9462e60107128a8216cab480079f8945ba;hb=27bfcfdaf05197261edd260263a46ad4405c04db;hp=0038e78acbaa28558ef3184ba38ee8cb7b7ef843;hpb=a60ec7310d582158700acf9f3fb1945cb05bacca;p=osm%2Fdevops.git diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 0038e78a..8215fd94 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -29,7 +29,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ apt-transport-https=1.6.12ubuntu0.2 \ - gnupg2=2.2.4-1ubuntu1.4 + gnupg2=2.2.4-1ubuntu1.4 \ + openssh-client 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 \ @@ -45,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 @@ -73,13 +70,20 @@ 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 + 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 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/ ########################################################################