Fix minor typo in Dockerfiles

[osm/devops.git] / docker / RO / Dockerfile

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 04f7c4c..b056c3d 100644 (file)
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -1,33 +1,44 @@
-##
-# Copyright 2019 ETSI
+#######################################################################################
+# Copyright ETSI Contributors and Others.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-##
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#######################################################################################
 
-########################################################################
+FROM ubuntu:22.04 as INSTALL
 
-FROM ubuntu:18.04 as INSTALL
+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 \
+    gcc=4:11.* \
+    python3=3.10.* \
+    python3-dev=3.10.* \
+    python3-pip=22.0.* \
+    curl=7.81.* \
+    && rm -rf /var/lib/apt/lists/*
+
+#######################################################################################
+# End of common preparation
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    gcc=4:7.4.* \
-    python3=3.6.* \
-    python3-dev=3.6.* \
-    python3-setuptools=39.0.* \
-    curl=7.58.* \
     genisoimage=9:1.1.* \
-    netbase=5.* && \
-    python3 -m easy_install pip==21.0.1 setuptools==51.0.0
+    netbase=6.*
 
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_NG_RO_URL
@@ -43,8 +54,7 @@ ARG PYTHON3_OSM_ROSDN_ONOSOF_URL
 ARG PYTHON3_OSM_ROSDN_ONOS_VPLS_URL
 ARG PYTHON3_OSM_ROVIM_AWS_URL
 ARG PYTHON3_OSM_ROVIM_AZURE_URL
-ARG PYTHON3_OSM_ROVIM_FOS_URL
-ARG PYTHON3_OSM_ROVIM_OPENNEBULA_URL
+ARG PYTHON3_OSM_ROVIM_GCP_URL
 ARG PYTHON3_OSM_ROVIM_OPENSTACK_URL
 ARG PYTHON3_OSM_ROVIM_OPENVIM_URL
 ARG PYTHON3_OSM_ROVIM_VMWARE_URL
@@ -64,8 +74,7 @@ RUN for URL in \
     $PYTHON3_OSM_ROSDN_ONOS_VPLS_URL \
     $PYTHON3_OSM_ROVIM_AWS_URL \
     $PYTHON3_OSM_ROVIM_AZURE_URL \
-    $PYTHON3_OSM_ROVIM_FOS_URL \
-    $PYTHON3_OSM_ROVIM_OPENNEBULA_URL \
+    $PYTHON3_OSM_ROVIM_GCP_URL \
     $PYTHON3_OSM_ROVIM_OPENSTACK_URL \
     $PYTHON3_OSM_ROVIM_OPENVIM_URL \
     $PYTHON3_OSM_ROVIM_VMWARE_URL ; do \
@@ -78,21 +87,47 @@ RUN pip3 install \
     -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_ng_ro/requirements.txt
 
-FROM ubuntu:18.04
+#######################################################################################
+#######################################################################################
+FROM ubuntu:22.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.6.* \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    python3-minimal=3.10.* \
     && 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
+COPY --from=INSTALL /usr/local/lib/python3.10/dist-packages  /usr/local/lib/python3.10/dist-packages
+
+#######################################################################################
+# End of common preparation
+
+RUN rm -f /etc/apt/apt.conf.d/proxy.conf
+
 COPY --from=INSTALL /usr/bin/genisoimage /usr/bin/genisoimage
 COPY --from=INSTALL /etc/protocols /etc/protocols
 
-VOLUME /var/log/osm
-
 EXPOSE 9090
 
+# Creating the user for the app
+RUN groupadd -g 1000 appuser && \
+    useradd -u 1000 -g 1000 -d /app appuser && \
+    mkdir -p /app/osm_ro && \
+    mkdir -p /app/storage/kafka && \
+    mkdir /app/log && \
+    chown -R appuser:appuser /app
+
+WORKDIR /app/osm_ro
+
+# Changing the security context
+USER appuser
+
 # Two mysql databases are needed (DB and DB_OVIM). Can be hosted on same or separated containers
 # These ENV must be provided
 ENV RO_DB_HOST=""
@@ -134,4 +169,3 @@ HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \
   CMD curl --silent --fail http://localhost:9090/ro || exit 1
 
 CMD ["python3", "-u", "-m", "osm_ng_ro.ro_main"]
-