X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=370f1fe02bf3b6720685f1af943db9bf41494a3f;hb=refs%2Fchanges%2F99%2F11499%2F2;hp=abd437a68bfe1e40611e00e1af197a3ef4095607;hpb=b89f26b8b330e5af11dc47c06c4e65cbbcd0a52b;p=osm%2Fdevops.git diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index abd437a6..370f1fe0 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -20,27 +20,29 @@ 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.14 \ - apt-transport-https=1.6.12ubuntu0.2 \ - gnupg2=2.2.4-1ubuntu1.4 \ - openssh-client && \ - python3 -m easy_install pip==21.0.1 - + 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 + +# https://kubernetes.io/releases/ 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 + && apt-get update && apt-get install -y kubectl=1.20.14-00 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/ -RUN curl https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz --output helm-v3.3.4.tar.gz \ - && tar -zxvf helm-v3.3.4.tar.gz \ +# https://github.com/helm/helm/releases +RUN curl https://get.helm.sh/helm-v3.7.2-linux-amd64.tar.gz --output helm-v3.7.2.tar.gz \ + && tar -zxvf helm-v3.7.2.tar.gz \ && mv linux-amd64/helm /usr/local/bin/helm3 \ && rm -r linux-amd64/ @@ -66,9 +68,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