From bea307477502fd13126df50e82494dee4eaf1214 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 1 Jul 2020 08:03:22 +0000 Subject: [PATCH] Dockerfile and tox.ini for devops-stages modified to work on ubuntu18.04 Change-Id: I67e8f9078478185ee47bca4301ff16a099baf8af Signed-off-by: garciadeblas --- Dockerfile | 13 ++++++------- tox.ini | 9 ++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 25d5d6a..24efbad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,14 +19,13 @@ # Use Dockerfile.fromdeb for running osm/NBI in a docker container from last stable package -FROM ubuntu:16.04 +FROM ubuntu:18.04 -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 +RUN apt-get update && apt-get -y install wget git make python python3 \ + libcurl4-gnutls-dev libgnutls28-dev tox python3-dev python3-pip \ + debhelper python-setuptools python-all python3-all apt-utils \ + python-magic && \ + DEBIAN_FRONTEND=noninteractive pip3 install -U stdeb setuptools-version-command # Uncomment this block to generate automatically a debian package and show info # # Set the working directory to /app diff --git a/tox.ini b/tox.ini index aba9bfc..a847ea1 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,6 @@ [tox] envlist = cover, flake8, unittest -toxworkdir={toxinidir}/.tox [testenv] usedevelop = True @@ -26,8 +25,8 @@ install_command = python3 -m pip install -r requirements.txt -U {opts} {packag basepython = python3 deps = nose2 - -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt + -rrequirements.txt + -rtest-requirements.txt commands = coverage erase nose2 -C --coverage osm_nbi --plugin nose2.plugins.junitxml -s osm_nbi/tests @@ -39,7 +38,7 @@ commands = basepython = python3 deps = flake8 - -r{toxinidir}/requirements.txt + -rrequirements.txt commands = flake8 osm_nbi setup.py --max-line-length 120 \ --exclude .svn,CVS,.gz,.git,__pycache__,.tox,local,temp,osm_im,.temp-tox --ignore W291,W293,E226,E402,W504 @@ -54,5 +53,5 @@ commands = python3 setup.py --command-packages=stdeb.command bdist_deb basepython = python3 deps = asynctest aioresponses -commands = python3 -m unittest discover {toxinidir}/osm_nbi/tests -v +commands = python3 -m unittest discover osm_nbi/tests -v -- 2.25.1