summaryrefslogtreecommitdiffstats
path: root/extra/docker
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2020-12-21 22:23:06 -0800
committerBryan Newbold <bnewbold@robocracy.org>2020-12-22 18:24:00 -0800
commitcb26a9db2a45da7318bb2671191ecbeebd4681a7 (patch)
treeee5e3f85f42f6624a50feeaab5bef4257b010bcd /extra/docker
parent7a68cdee83cb91a2c9ecd2642e12d760ad445ef0 (diff)
downloadfatcat-cb26a9db2a45da7318bb2671191ecbeebd4681a7.tar.gz
fatcat-cb26a9db2a45da7318bb2671191ecbeebd4681a7.zip
docker xenial: use get-pipenv.py to install pipenv et al
Diffstat (limited to 'extra/docker')
-rw-r--r--extra/docker/Dockerfile.test-base11
1 files changed, 6 insertions, 5 deletions
diff --git a/extra/docker/Dockerfile.test-base b/extra/docker/Dockerfile.test-base
index b678ebd6..ff8c61e3 100644
--- a/extra/docker/Dockerfile.test-base
+++ b/extra/docker/Dockerfile.test-base
@@ -19,8 +19,8 @@ RUN set -eux; \
RUN set -eux; \
apt update -qy; \
apt install -y \
- software-properties-common wget pkg-config git \
- libpq-dev libsnappy-dev libsodium-dev software-properties-common \
+ software-properties-common wget curl pkg-config git \
+ libpq-dev libsnappy-dev libsodium-dev \
python3.7 python3.7-dev python3.7-venv python3.7-distutils \
python3.8 python3.8-dev python3.8-venv python3.8-distutils \
python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest
@@ -45,8 +45,9 @@ RUN set -eux; \
cargo install diesel_cli --version 1.3.1 --no-default-features --features postgres; \
diesel --version
-# Install pipenv
+# Install pipenv using aggressive 'get-pipenv.py' script
+# this will clobber distro installation of, eg, 'pip'
+# original command: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python3; \
RUN set -eux; \
- pip3 install pipenv; \
+ curl -L https://archive.org/download/pipenv-mirror/get-pipenv.2020-12-22.py | python3; \
pipenv --version
-