X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=Dockerfile;h=3ca4992b904b8b8607f432c147a991ebe8b778a7;hp=c811fb74233091f883b5806065ea44f9cbe8b683;hb=refs%2Fchanges%2F59%2F11959%2F1;hpb=5b3f4b6983b2957df33e5995ce32f3351a089290

diff --git a/Dockerfile b/Dockerfile
index c811fb7..3ca4992 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,20 +21,28 @@
 #   devops-stages/stage-build.sh
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
+
+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 update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y install \
         debhelper \
+        dh-python \
         git \
-        python3 \
+        python3.8 \
         python3-all \
-        python3-dev \
+        python3.8-dev \
         python3-setuptools
 
-RUN python3 -m easy_install pip==21.0.1
-RUN pip3 install tox==3.22.0
+RUN python3 -m easy_install pip==21.3.1
+RUN pip install tox==3.24.5
 
-RUN DEBIAN_FRONTEND=noninteractive apt -y install wget build-essential dh-make \
-                                            openjdk-8-jdk maven
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install wget build-essential dh-make \
+                                              openjdk-8-jdk maven
 RUN update-java-alternatives --set /usr/lib/jvm/java-1.8.0-openjdk-amd64