X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Dockerfile;h=9623f7f1e6c8a0c06eb66b4fcbb3d327e87e7579;hb=a183de070f586875d953d43fa9d14ed031d483a8;hp=90b7f941e52835dac0488010ec6a46d217dccceb;hpb=eb2de82e1687c0592228833146d0e0452e09a92f;p=osm%2FIM.git

diff --git a/Dockerfile b/Dockerfile
index 90b7f94..9623f7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,20 +21,30 @@
 #   devops-stages/stage-build.sh
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:22.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-all \
         python3-dev \
-        python3-setuptools
+        python3-setuptools \
+        python3-pip \
+        tox
 
-RUN python3 -m easy_install pip==21.0.1
-RUN pip3 install tox==3.22.0
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget build-essential dh-make \
+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