X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=Dockerfile;h=9ed97d6dccf2a85a61f6e91c7d1f43238284e20d;hp=71e649f2688528c612c160c3cb3fd43d28bf3762;hb=b64cf0c1aab5292a6d32e9d57bedfb28136b54ed;hpb=c9a2765ea2f035a1e5dd53d71d629880605c5071

diff --git a/Dockerfile b/Dockerfile
index 71e649f2..9ed97d6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,43 +15,20 @@
 
 # This Dockerfile is intented for devops and deb package generation
 #
-# Use docker/Dockerfile-local for running osm/RO in a docker container from source
+# Use Dockerfile-local for running osm/RO in a docker container from source
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 RUN  apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get --yes install git tox make python-all python3 python3-pip debhelper wget && \
-  DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-all libssl-dev flake8 apt-utils && \
-  DEBIAN_FRONTEND=noninteractive pip3 install -U setuptools setuptools-version-command stdeb
-
-# FROM ubuntu:16.04
-
-# RUN  apt-get update && \
-#   DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper python3 python3-all python3-pip python3-setuptools && \
-#   DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox apt-utils flake8 python-nose python-mock && \
-#   DEBIAN_FRONTEND=noninteractive pip install pip==9.0.3 && \
-#   DEBIAN_FRONTEND=noninteractive pip3 install pip==9.0.3 && \
-#   DEBIAN_FRONTEND=noninteractive pip install -U setuptools setuptools-version-command stdeb && \
-#   DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \
-#   DEBIAN_FRONTEND=noninteractive pip3 install -U pyang pyangbind && \
-#   DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \
-#   DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
-#   DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:queens && \
-#   DEBIAN_FRONTEND=noninteractive apt-get update && \
-#   DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient python-networking-l2gw && \
-#   DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==19.1.1 && \
-#   DEBIAN_FRONTEND=noninteractive pip install -U fog05rest && \
-#   DEBIAN_FRONTEND=noninteractive pip install -U azure && \
-#   DEBIAN_FRONTEND=noninteractive apt-get -y install python-argcomplete python-bottle python-cffi python-packaging python-paramiko python-pkgconfig libmysqlclient-dev libssl-dev libffi-dev python-mysqldb && \
-#   DEBIAN_FRONTEND=noninteractive apt-get -y install python-logutils python-openstackclient python-openstacksdk && \
-#   DEBIAN_FRONTEND=noninteractive pip install untangle && \
-#   DEBIAN_FRONTEND=noninteractive pip install pyone && \
-#   DEBIAN_FRONTEND=noninteractive pip install -e git+https://github.com/python-oca/python-oca#egg=oca
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install git tox make python3 python3-pip debhelper wget \
+      python3-all apt-utils libmysqlclient-dev mysql-client  && \
+    DEBIAN_FRONTEND=noninteractive python3 -m pip install -U setuptools setuptools-version-command stdeb
+    # needed for tests:  libmysqlclient-dev mysql-client tox
 
+    # TODO remove apt # libssl-dev
 # TODO py3 comment
 # 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  {} ";"
-
+# CMD /app/devops-stages/stage-build.sh && find deb_dist -name "*.deb" -exec dpkg -I  {} ";"