From 2682d0e3e7edf511f1cd2c4800343b269087f954 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Fri, 11 Dec 2020 13:49:40 -0800 Subject: docker xenial: include python3.8 --- extra/docker/Dockerfile.test-base | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'extra/docker') diff --git a/extra/docker/Dockerfile.test-base b/extra/docker/Dockerfile.test-base index a556ed99..1413f88e 100644 --- a/extra/docker/Dockerfile.test-base +++ b/extra/docker/Dockerfile.test-base @@ -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 pkg-config git \ + libpq-dev libsnappy-dev libsodium-dev software-properties-common \ + 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; \ -- cgit v1.2.3 From 7a68cdee83cb91a2c9ecd2642e12d760ad445ef0 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 21 Dec 2020 22:22:40 -0800 Subject: docker xenial: switch to rust 1.43.0 --- extra/docker/Dockerfile.test-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extra/docker') diff --git a/extra/docker/Dockerfile.test-base b/extra/docker/Dockerfile.test-base index 1413f88e..b678ebd6 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 -- cgit v1.2.3 From cb26a9db2a45da7318bb2671191ecbeebd4681a7 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Mon, 21 Dec 2020 22:23:06 -0800 Subject: docker xenial: use get-pipenv.py to install pipenv et al --- extra/docker/Dockerfile.test-base | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'extra/docker') 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 - -- cgit v1.2.3