Merge branch 'bnewbold-ci-cleanups' into 'master'

Gitlab CI and docker base image cleanups

See merge request webgroup/fatcat!94

2 files changed, 32 insertions, 10 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c563c487..edbaca5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ variables:
   PIPENV_VENV_IN_PROJECT: "true"
   CARGO_HOME: ".cargo_cache"
 
-image: "bnewbold/fatcat-test-base:latest"
+image: "bnewbold/fatcat-test-base:xenial"
 
 unified_test:
   variables:
@@ -28,9 +28,15 @@ unified_test:
   before_script:
     - export PATH="$PATH:$CARGO_HOME/bin"
     - 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 libpq-dev pkg-config python3-pytest git
+    - >
+        apt install -y
+        software-properties-common wget 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
     - diesel --version || cargo install diesel_cli --version 1.3.1 --no-default-features --features postgres
-    - pipenv --version || python3.7 -m pip install pipenv
+    - pipenv --version || python3.5 -m pip install pipenv
     - pipenv --version
   script:
     - rustc --version && cargo --version && diesel --version
@@ -61,7 +67,11 @@ rust_build_release:
   before_script:
     - export PATH="$PATH:$CARGO_HOME/bin"
     - apt update -qy
-    - apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev
+    - >
+        apt install -y
+        software-properties-common wget pkg-config git
+        libpq-dev libsnappy-dev libsodium-dev
+        python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest
   script:
     - rustc --version && cargo --version
     - cd rust
@@ -76,7 +86,13 @@ python_build_release:
   when: manual
   before_script:
     - apt update -qy
-    - apt install -y python3-dev python3-pip python3-wheel python3-requests python3-six python3-pytest libsnappy-dev libsodium-dev
+    - >
+        apt install -y
+        software-properties-common wget 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
     - pip3 install pipenv
   script:
     - python3 --version
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
-