X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=fcf3f603fb9446f332a67a6a3514e5a09567af51;hb=437867e3efe164972a013db5fd40b76f0e3454c1;hp=a0a093559a2fdec6ccd24fdb39e8551a5bdf7a84;hpb=02feb8ef9ae5f545a111759cbbe9f01b1741cc85;p=osm%2Fdevops.git diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index a0a09355..fcf3f603 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -32,7 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ curl=7.81.* \ && rm -rf /var/lib/apt/lists/* -########### End of common prepration +########### End of common preparation RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ @@ -42,18 +42,17 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ && rm -rf /var/lib/apt/lists/* # 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.23.3-00 +RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.30/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg \ + && echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.30/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list \ + && apt-get update && apt-get install -y kubectl=1.30.1-1.1 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/ - # 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 \ +RUN curl https://get.helm.sh/helm-v3.15.1-linux-amd64.tar.gz --output helm-v3.15.1.tar.gz \ + && tar -zxvf helm-v3.15.1.tar.gz \ && mv linux-amd64/helm /usr/local/bin/helm3 \ && rm -r linux-amd64/ @@ -93,7 +92,7 @@ COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-package COPY --from=INSTALL /usr/local/lib/python3.10/dist-packages /usr/local/lib/python3.10/dist-packages ####################################################################################### -# End of common prepration +# End of common preparation RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \