Dockerfiles: Use Python venv instead of virtualenv

3 years ago · 6e3b6eca5d
5 changed files with 8 additions and 8 deletions
--- a/test/Dockerfiles/bionic-py3.Dockerfile
+++ b/test/Dockerfiles/bionic-py3.Dockerfile
@ -4,7 +4,7 @@ SHELL ["/bin/bash", "-c"]
 # dependencies
 RUN apt-get update
 RUN apt-get install -y \
-    python3-dev python3-pip virtualenv libsodium23
+    python3-dev python3-pip libsodium23 python3-venv

 # curl is a better tool
 RUN apt-get install -y curl
@ -30,5 +30,5 @@ RUN bitcoind --version | head -1

 # install script
 WORKDIR ${repo_name}
-RUN virtualenv --python=python3 jmvenv
+RUN python3 -m venv jmvenv
 RUN source jmvenv/bin/activate && ./test/run_tests.sh
--- a/test/Dockerfiles/centos7-py3.Dockerfile
+++ b/test/Dockerfiles/centos7-py3.Dockerfile
@ -6,7 +6,7 @@ RUN yum -y groups install 'Development tools'
 RUN yum -y install epel-release && \
    yum -y update
 RUN yum -y install \
-    python3-devel python3-pip python3-virtualenv libsodium
+    python3-devel python3-pip libsodium

 RUN useradd --home-dir /home/chaum --create-home --shell /bin/bash --skel /etc/skel/ chaum
 ARG core_version
@ -29,5 +29,5 @@ RUN bitcoind --version | head -1

 # install script
 WORKDIR ${repo_name}
-RUN virtualenv-3 --python=python3 jmvenv
+RUN python3 -m venv jmvenv
 RUN source jmvenv/bin/activate && ./test/run_tests.sh
--- a/test/Dockerfiles/fedora27-py3.Dockerfile
+++ b/test/Dockerfiles/fedora27-py3.Dockerfile
@ -4,7 +4,7 @@ SHELL ["/bin/bash", "-c"]
 # dependencies
 RUN dnf -y groups install 'Development tools'
 RUN dnf -y install \
-    python3-devel python3-pip python3-virtualenv libsodium
+    python3-devel python3-pip libsodium

 # needed for build time
 # https://stackoverflow.com/questions/34624428/g-error-usr-lib-rpm-redhat-redhat-hardened-cc1-no-such-file-or-directory
@ -31,5 +31,5 @@ RUN bitcoind --version | head -1

 # install script
 WORKDIR ${repo_name}
-RUN virtualenv-3 --python=python3 jmvenv
+RUN python3 -m venv jmvenv
 RUN source jmvenv/bin/activate && ./test/run_tests.sh
--- a/test/Dockerfiles/stretch-py3.Dockerfile
+++ b/test/Dockerfiles/stretch-py3.Dockerfile
@ -7,7 +7,7 @@ RUN apt-get install -y build-essential
 RUN apt-get install -y \
    automake pkg-config libtool
 RUN apt-get install -y \
-    python3-dev python3-pip virtualenv python3-pyqt4 python3-sip
+    python3-dev python3-pip python3-pyqt4 python3-sip python3-venv

 # curl is a better tool
 RUN apt-get install -y curl
--- a/test/Dockerfiles/xenial-py3.Dockerfile
+++ b/test/Dockerfiles/xenial-py3.Dockerfile
@ -7,7 +7,7 @@ RUN apt-get install -y build-essential
 RUN apt-get install -y \
    automake pkg-config libtool
 RUN apt-get install -y \
-    python3-dev python3-pip virtualenv python3-pyqt4 python3-sip
+    python3-dev python3-pip python3-pyqt4 python3-sip python3-venv

 # curl is a better tool
 RUN apt-get install -y curl