summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@archive.org>2021-01-05 01:17:00 +0000
committerbnewbold <bnewbold@archive.org>2021-01-05 01:17:00 +0000
commit7c2501542395296ba0c2791f74ba3036a342a45a (patch)
tree5f1be2f80d739d7bc42ea6f00c0d960aac8e12d3
parent44b91bed5a0fb3dab46fd0641691bb9e6b5b6078 (diff)
parent830cb7eb006507cd3d176efe25a34f8a02cce677 (diff)
downloadfatcat-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
-rw-r--r--.gitlab-ci.yml26
-rw-r--r--extra/docker/Dockerfile.test-base16
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
-