This is an automated email from the ASF dual-hosted git repository.

tomaz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/libcloud.git

commit ca9c274cef24cd4935a51da5e6d914ff07589df0
Author: Tomaz Muraus <[email protected]>
AuthorDate: Sun May 3 17:18:11 2020 +0200

    Update Dockerfile to use more recent Ubuntu distro and Python 3 for
    running tox target.
---
 CHANGES.rst        | 3 +++
 contrib/Dockerfile | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 767a653..55147b3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -18,6 +18,9 @@ Other
 - Update ``contrib/Dockerfile`` which can be used for running tests so
   it only run tests with Python versions we support. This means dropping
   support for Python < 3.5 and adding support for Python 2.8 and 3.8.
+
+  Also update it to use a more recent Ubuntu version (18.04) and Python 3
+  for running tox target.
   (GITHUB-1451)
   [Tomaz Muraus - @Kami, HuiFeng Tang - @99Kies]
 
diff --git a/contrib/Dockerfile b/contrib/Dockerfile
index ad0a5fa..7f0ff77 100644
--- a/contrib/Dockerfile
+++ b/contrib/Dockerfile
@@ -15,7 +15,7 @@
 
 # Docker image used for running tests the under all the supported Python
 # versions
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN set -e && \
     apt-get update && \
@@ -37,16 +37,16 @@ RUN set -e && \
       python3.7-dev \
       #python3.8-dev \
       pypy3 \
-      python-pip \
+      python3-pip \
       libvirt-dev \
       # Needed by libvirt driver
       pkg-config
 
 # Workaround for zipp import error issue - 
https://github.com/pypa/virtualenv/issues/1630
-RUN pip install --upgrade pip
+RUN python3 -m pip install --upgrade pip
 
 RUN set -e && \
-    pip install --no-cache-dir "tox==3.14.2"
+    python3 -m pip install --no-cache-dir "tox==3.14.2"
 
 COPY . /libcloud
 

Reply via email to