X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=Dockerfile;h=2a64fdc6a1a77ed263ad16a5dc5d951ad3d814ea;hp=25d5d6a0cd376915546c827c65bb3508335959cf;hb=HEAD;hpb=533f64d4ae4bb971d750c84bf274729bd6163b5d

diff --git a/Dockerfile b/Dockerfile
index 25d5d6a..c4c9b6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,3 @@
-# Copyright 2018 Telefonica S.A.
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -12,26 +10,39 @@
 # 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/NBI in a docker container from source
-# Use Dockerfile.fromdeb for running osm/NBI in a docker container from last stable package
+#   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
 
+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
 
-FROM ubuntu:16.04
+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
 
-RUN apt-get update && apt-get -y install wget 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
+ENV LC_ALL C.UTF-8
+ENV LANG C.UTF-8
 
-# Uncomment this block to generate automatically a debian package and show info
-# # Set the working directory to /app
-# WORKDIR /app
-# # Copy the current directory contents into the container at /app
-# ADD . /app
-# CMD /app/devops-stages/stage-build.sh && find -name "*.deb" -exec dpkg -I  {} ";"
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget