X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FRO%2FDockerfile;h=7d1bf52c8de93fa7d54173063e6825022f7b9a99;hb=630b40ab807db159acb4e922cd627f95e02e358b;hp=8dbba7e795b2945849f77dbf9a2d711aa058a03e;hpb=fd164afb3c0f828561b41c6c42a1e351c5d9b653;p=osm%2Fdevops.git diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile index 8dbba7e7..7d1bf52c 100644 --- a/docker/RO/Dockerfile +++ b/docker/RO/Dockerfile @@ -27,7 +27,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \ curl=7.58.* \ genisoimage=9:1.1.* \ netbase=5.* && \ - python3 -m easy_install pip==21.0.1 + python3 -m easy_install pip==21.0.1 setuptools==51.0.0 ARG PYTHON3_OSM_COMMON_URL ARG PYTHON3_OSM_NG_RO_URL @@ -43,8 +43,9 @@ 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_GCP_URL ARG PYTHON3_OSM_ROVIM_FOS_URL -ARG PYTHON3_OSM_ROVIM_OPENNEBULA_URL +# ARG PYTHON3_OSM_ROVIM_OPENNEBULA_URL ARG PYTHON3_OSM_ROVIM_OPENSTACK_URL ARG PYTHON3_OSM_ROVIM_OPENVIM_URL ARG PYTHON3_OSM_ROVIM_VMWARE_URL @@ -64,8 +65,9 @@ RUN for URL in \ $PYTHON3_OSM_ROSDN_ONOS_VPLS_URL \ $PYTHON3_OSM_ROVIM_AWS_URL \ $PYTHON3_OSM_ROVIM_AZURE_URL \ + $PYTHON3_OSM_ROVIM_GCP_URL \ $PYTHON3_OSM_ROVIM_FOS_URL \ - $PYTHON3_OSM_ROVIM_OPENNEBULA_URL \ + # $PYTHON3_OSM_ROVIM_OPENNEBULA_URL \ $PYTHON3_OSM_ROVIM_OPENSTACK_URL \ $PYTHON3_OSM_ROVIM_OPENVIM_URL \ $PYTHON3_OSM_ROVIM_VMWARE_URL ; do \ @@ -81,17 +83,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.* + 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 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="" @@ -133,4 +147,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"] -