X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2Fosmclient%2FDockerfile;h=7c46007666dc3ae15bbcbd2ea89b9e872b02f5b2;hb=refs%2Fchanges%2F02%2F11102%2F1;hp=0d2ec31baec23d3a5b953d3af62094c0c8e2a1c5;hpb=c67a2378b3eb4fa1a42149b7118becf5cb0e1ffc;p=osm%2Fdevops.git

diff --git a/docker/osmclient/Dockerfile b/docker/osmclient/Dockerfile
index 0d2ec31b..7c460076 100644
--- a/docker/osmclient/Dockerfile
+++ b/docker/osmclient/Dockerfile
@@ -1,27 +1,53 @@
-FROM ubuntu:16.04
-
-LABEL authors="Michael Marchetti"
-
-RUN apt-get update && apt-get -y install curl software-properties-common
-
-RUN apt-get update && apt-get -y install python \
-    libcurl4-gnutls-dev libgnutls-dev iputils-ping python-pip \
-    python-openstackclient wget
-RUN pip install python-magic pytest==4.6.3
-
-ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseFOUR-daily
-ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg
-ARG REPOSITORY=testing
-
-RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add -
-RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} devops osmclient" && apt update
-
-ARG OSMCLIENT_VERSION
-ARG DEVOPS_VERSION
-
-RUN apt-get update && apt-get -y install osm-devops${DEVOPS_VERSION} python-osmclient${OSMCLIENT_VERSION}
+#######################################################################################
+# 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
+#
+#    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.
+#######################################################################################
+
+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.14 \
+    libcurl4-openssl-dev=7.58.0-2ubuntu3.14 \
+    libssl-dev=1.1.1-1ubuntu2.1~18.04.9 && \
+    python3 -m easy_install pip==21.0.1
+
+ARG PYTHON3_OSMCLIENT_URL
+ARG PYTHON3_OSM_IM_URL
+
+RUN curl $PYTHON3_OSMCLIENT_URL -o osmclient.deb
+RUN dpkg -i ./osmclient.deb
+
+RUN curl $PYTHON3_OSM_IM_URL -o osm_im.deb
+RUN dpkg -i ./osm_im.deb
+
+RUN pip3 install \
+    -r /usr/lib/python3/dist-packages/osmclient/requirements.txt \
+    -r /usr/lib/python3/dist-packages/osm_im/requirements.txt
+
+FROM ubuntu:18.04 as FINAL
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+
+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
 
 ENV OSM_SOL005=True
 ENV OSM_HOSTNAME=nbi:9999
-ENV OSM_RO_HOSTNAME=ro:9090