X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FLCM%2FDockerfile;h=4a286ca1914d9f31e6e5165429146e14219bdb2f;hb=refs%2Ftags%2Fv10.1.4;hp=8669369a3091dce4878ee742ba966e683c89dfd4;hpb=5a6d11284fc7a4b1fdc27ffecf2221cbb3f27550;p=osm%2Fdevops.git diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index 8669369a..4a286ca1 100644 --- a/docker/LCM/Dockerfile +++ b/docker/LCM/Dockerfile @@ -27,26 +27,26 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ python3-setuptools=45.2.* \ curl=7.68.* -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ +RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ + DEBIAN_FRONTEND=noninteractive apt-get --yes install \ apt-transport-https=2.0.* \ gnupg2=2.2.* \ openssh-client=1: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 + && apt-get update && apt-get install -y kubectl=1.23.3-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 \ +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/ - ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_LCM_URL ARG PYTHON3_N2VC_URL @@ -96,14 +96,25 @@ 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 + +RUN mkdir /opt/prometheus +RUN chown appuser: /opt/prometheus -# Used for local storage -VOLUME /app/storage -# Used for logs -VOLUME /app/log +WORKDIR /app/osm_lcm + +# 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 @@ -151,7 +162,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" ] -