Update openjdk version to 19 and yang2swagger version to 2.1.0

[osm/IM.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 90b7f94..01475b0 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,20 +21,28 @@
 #   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
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install wget build-essential dh-make \
+                                              openjdk-19-jdk maven
+RUN update-java-alternatives --jre-headless --set /usr/lib/jvm/java-1.19.0-openjdk-amd64
 
-RUN 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