X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FMON%2FDockerfile;h=fbb0600e35df98a5e59ffe5336d52959354ac02f;hb=f8c3ce569b2b7fe824a15cf4e3d6c6876d9a0a5d;hp=f57274869da8442290197c50ede2e3ef16824fe2;hpb=b89f26b8b330e5af11dc47c06c4e65cbbcd0a52b;p=osm%2Fdevops.git

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index f5727486..fbb0600e 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -24,13 +24,15 @@ FROM ubuntu:20.04 as INSTALL
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    curl=7.68.0-1ubuntu2.6 \
-    gcc=4:9.3.0-1ubuntu2 \
-    python3=3.8.2-0ubuntu2 \
-    python3-setuptools=45.2.0-1 \
-    python3-dev=3.8.2-0ubuntu2 \
-    openssh-client=1:8.2p1-4ubuntu0.2 && \
-    python3 -m easy_install pip==21.0.1
+    gcc=4:9.3.* \
+    python3=3.8.* \
+    python3-dev=3.8.* \
+    python3-pip=20.0.2* \
+    python3-setuptools=45.2.* \
+    curl=7.68.*
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    openssh-client=1:8.*
 
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_MON_URL
@@ -50,13 +52,24 @@ RUN pip3 install \
     -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_mon/requirements.txt
 
+#######################################################################################
 FROM ubuntu:20.04 as FINAL
 
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+    echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+    echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+    fi
+
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
-    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.8.2-0ubuntu2
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    python3-minimal=3.8.* \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    ca-certificates
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    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.8/dist-packages  /usr/local/lib/python3.8/dist-packages
@@ -67,7 +80,22 @@ 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_mon/scripts/
+
+# Creating the user for the app
+RUN groupadd -g 1000 appuser && \
+    useradd -u 1000 -g 1000 -d /app appuser && \
+    mkdir -p /app/osm_mon && \
+    mkdir -p /app/storage/kafka && \
+    mkdir /app/log && \
+    chown -R appuser:appuser /app
+
+WORKDIR /app/osm_mon
+
+# Changing the security context
+USER appuser
+
+########################################################################
 
 ENV OSMMON_MESSAGE_DRIVER kafka
 ENV OSMMON_MESSAGE_HOST kafka