diff options
| author | bnewbold <bnewbold@archive.org> | 2021-01-05 01:17:00 +0000 |
|---|---|---|
| committer | bnewbold <bnewbold@archive.org> | 2021-01-05 01:17:00 +0000 |
| commit | 7c2501542395296ba0c2791f74ba3036a342a45a (patch) | |
| tree | 5f1be2f80d739d7bc42ea6f00c0d960aac8e12d3 /extra/docker | |
| parent | 44b91bed5a0fb3dab46fd0641691bb9e6b5b6078 (diff) | |
| parent | 830cb7eb006507cd3d176efe25a34f8a02cce677 (diff) | |
| download | fatcat-7c2501542395296ba0c2791f74ba3036a342a45a.tar.gz fatcat-7c2501542395296ba0c2791f74ba3036a342a45a.zip | |
Merge branch 'bnewbold-ci-cleanups' into 'master'
Gitlab CI and docker base image cleanups
See merge request webgroup/fatcat!94
Diffstat (limited to 'extra/docker')
| -rw-r--r-- | extra/docker/Dockerfile.test-base | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/extra/docker/Dockerfile.test-base b/extra/docker/Dockerfile.test-base index a556ed99..ff8c61e3 100644 --- a/extra/docker/Dockerfile.test-base +++ b/extra/docker/Dockerfile.test-base @@ -4,7 +4,7 @@ FROM ubuntu:xenial ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ - RUST_VERSION=1.42.0 \ + RUST_VERSION=1.43.0 \ LC_ALL=C.UTF-8 \ LANG=C.UTF-8 @@ -18,7 +18,12 @@ RUN set -eux; \ # APT dependencies RUN set -eux; \ apt update -qy; \ - apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev software-properties-common python3.7 python3.7-dev python3.7-venv python3.7-distutils wget libpq-dev pkg-config python3-pytest git + apt install -y \ + 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 # Rust setup from docker-rust debian Dockerfile RUN set -eux; \ @@ -40,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 - |