X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FRO%2FDockerfile;h=39462de6fad002997db1a57d588d6e83ae32df0a;hb=dbede6504a919a1c5f07955764d1b97b214fe31f;hp=26c148b3bb03a5ebf2a9238edca26c94403ef07a;hpb=a60ec7310d582158700acf9f3fb1945cb05bacca;p=osm%2Fdevops.git diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index 26c148b3..39462de6 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -20,15 +20,14 @@ FROM ubuntu:18.04 as INSTALL RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - gcc=4:7.4.0-1ubuntu2.3 \ - python3=3.6.7-1~18.04 \ - python3-dev=3.6.7-1~18.04 \ - python3-setuptools=39.0.1-2 \ - curl=7.58.0-2ubuntu3.13 && \ - python3 -m easy_install pip==21.0.1 - -RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \ - genisoimage=9:1.1.11-3ubuntu2 + 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 ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_NG_RO_URL @@ -44,8 +43,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 @@ -65,8 +63,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 \ @@ -82,16 +79,29 @@ RUN pip3 install \ FROM ubuntu:18.04 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ - DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04 + DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.* \ + && 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/bin/genisoimage /usr/bin/genisoimage - -VOLUME /var/log/osm +COPY --from=INSTALL /etc/protocols /etc/protocols 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="" @@ -133,4 +143,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"] -