X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docker%2Fosdf%2FDockerfile;h=9d70961db6d26fa4c48fffd2b64155ad9c7ef3fd;hb=869b18e4db3be57075cf0deb24d62b33f6c6879a;hp=5860df2d5f73f10a5ede960cc464df766fe3d32d;hpb=bfb0a45de2eaade4064c40d294fd56e89672d199;p=optf%2Fosdf.git

diff --git a/docker/osdf/Dockerfile b/docker/osdf/Dockerfile
index 5860df2..9d70961 100644
--- a/docker/osdf/Dockerfile
+++ b/docker/osdf/Dockerfile
@@ -17,12 +17,13 @@
 # -------------------------------------------------------------------------
 #
 
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 ARG MVN_ARTIFACT_VERSION
 ARG REPO
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
+ARG DEBIAN_FRONTEND=noninteractive
 
 ENV http_proxy $HTTP_PROXY
 ENV https_proxy $HTTPS_PROXY
@@ -30,29 +31,23 @@ ENV https_proxy $HTTPS_PROXY
 ENV OSDF_PORT "8699"
 EXPOSE ${OSDF_PORT}
 
-ENV MZN 2.4.2
-ENV MZN_BASENAME MiniZincIDE-${MZN}-bundle-linux
-ENV MZN_GH_BASE https://github.com/MiniZinc/MiniZincIDE
-ENV MZN_DL_URL ${MZN_GH_BASE}/releases/download/${MZN}/${MZN_BASENAME}-x86_64.tgz
-
 RUN apt-get update -y \
-    && apt-get install -y vim unzip wget libmpfr-dev \
-    && apt-get install -y git libqt5printsupport5 build-essential \
-    && apt-get install -y python3 python3-setuptools python3-dev \
-    && easy_install3 pip \
-    && pip install --upgrade virtualenv pip wheel setuptools
+    && apt-get install -y --no-install-recommends software-properties-common wget \
+    curl ca-certificates vim unzip zip git binutils binfmt-support build-essential  \
+    python3 python3-setuptools python3-dev \
+    && ln -s /usr/bin/python3.8 /usr/bin/python \
+    && curl -s https://bootstrap.pypa.io/get-pip.py | python \
+    && python -m pip --no-cache-dir  install --upgrade pip wheel setuptools && rm -rf /var/lib/apt/lists/*
 
-RUN ln -s /usr/bin/python3.5 /usr/bin/python
+ARG MZN_DL_URL=https://github.com/MiniZinc/MiniZincIDE/releases/download/2.4.3/MiniZincIDE-2.4.3-bundle-linux-x86_64.tgz
 
 # Minizinc
 RUN wget -q $MZN_DL_URL -O /tmp/mz.tgz \
-    && tar xzf /tmp/mz.tgz \
-    && mv $MZN_BASENAME /mz-dist \
-    && rm /tmp/mz.tgz \
-    && echo PATH=/mz-dist/bin:$PATH >> ~/.bashrc
+    && mkdir -p /mz-dist && tar xzf /tmp/mz.tgz -C /mz-dist --strip-components 1\
+    && rm /tmp/mz.tgz
 
 ENV SHELL /bin/bash
-ENV PATH /mz-dist:$PATH
+ENV PATH /mz-dist/bin:$PATH
 
 # OSDF
 WORKDIR /opt/osdf
@@ -65,11 +60,12 @@ RUN groupadd onap \
 COPY onap-osdf-tm/optf-osdf-${MVN_ARTIFACT_VERSION}.zip /tmp/optf-osdf.zip
 COPY onap-osdf-tm/apps /opt/osdf/apps
 RUN unzip -q -o -B /tmp/optf-osdf.zip -d /opt/ && rm -f /tmp/optf-osdf.zip
+
 RUN mkdir -p /var/log/onap/optf/osdf/ \
     && chown -R onap:onap /var/log/onap \
     && chown -R onap:onap /opt/osdf
 
-RUN pip install --no-cache-dir -r requirements.txt
+RUN python -m pip install --no-cache-dir -r requirements.txt -r requirements-osdf.txt
 
 USER onap