X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=fbc8ef6212babd296bd2d3f520556d6df4ebc0b2;hb=refs%2Fchanges%2F22%2F13522%2F7;hp=0aa7d6d8765036d8587a97e925a3c342bc8e867f;hpb=102853026888d526a9d18987fab18b141578e528;p=osm%2Fdevops.git diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 0aa7d6d8..fbc8ef62 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -39,9 +39,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ openssh-client=1:8.* # 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 mkdir /etc/apt/keyrings \ + && curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.24/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.24/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list \ + && apt-get update && apt-get install -y kubectl=1.24.17-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 \ @@ -54,7 +55,6 @@ RUN curl https://get.helm.sh/helm-v3.7.2-linux-amd64.tar.gz --output helm-v3.7.2 && mv linux-amd64/helm /usr/local/bin/helm3 \ && rm -r linux-amd64/ - ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_LCM_URL ARG PYTHON3_N2VC_URL @@ -104,14 +104,24 @@ 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/ +COPY scripts/ /app/osm_lcm/scripts/ -######################################################################## +# Creating the user for the app +RUN groupadd -g 1000 appuser && \ + useradd -u 1000 -g 1000 -d /app appuser && \ + mkdir -p /app/osm_lcm && \ + mkdir -p /app/storage/kafka && \ + mkdir /app/log && \ + chown -R appuser:appuser /app && \ + chown appuser: /etc/ssl/certs/ca-certificates.crt + + +WORKDIR /app/osm_lcm -# Used for local storage -VOLUME /app/storage -# Used for logs -VOLUME /app/log +# Changing the security context +USER appuser + +######################################################################## # The following ENV can be added with "docker run -e xxx' to configure LCM ENV OSMLCM_RO_HOST ro @@ -159,7 +169,5 @@ ENV OSMLCM_VCA_STABLEREPOURL https://charts.helm.sh/stable HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \ CMD python3 -m osm_lcm.lcm_hc || exit 1 - # Run app.py when the container launches CMD [ "/bin/bash", "scripts/start.sh" ] -