X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=Dockerfile;h=27ab273a240d0b2331f4f573d7ebb0f05c2be2f0;hb=13d3d704fc0a72876588952b89b869525562a20f;hp=8dd12219235057e3efc5d94206b98811906ecc27;hpb=096d9ed76b12451072219747a3596dc800138a25;p=osm%2Fcommon.git

diff --git a/Dockerfile b/Dockerfile
index 8dd1221..27ab273 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,17 +10,36 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-# This Dockerfile is intented for devops and deb package generation
+########################################################################################
+# This Dockerfile is intented for devops testing and deb package generation
+#
+# To run stage 2 locally:
 #
-# Use Dockerfile.local for running osm/LCM in a docker container from source
+#   docker build -t stage2 .
+#   docker run -ti -v `pwd`:/work -w /work --entrypoint /bin/bash stage2
+#   devops-stages/stage-test.sh
+#   devops-stages/stage-build.sh
+#
+
+FROM ubuntu:22.04
 
-FROM ubuntu:16.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 apt-get update && apt-get -y install git make python python3 python-pip\
-    libcurl4-gnutls-dev libgnutls-dev tox python-dev python3-dev \
-    debhelper python-setuptools python-all python3-all apt-utils python-magic \
-    python3-pip python-pip && \
-    DEBIAN_FRONTEND=noninteractive pip3 install -U stdeb setuptools-version-command && \
-    DEBIAN_FRONTEND=noninteractive pip2 install -U stdeb
+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-pip \
+        tox
 
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8