upgrade ci-linux to ubuntu

dockerfiles/base-ci/README.md

@@ -1,10 +1,10 @@
-# base-ci-linux
+# base-ci
 
-Docker image based on [official Debian image](https://hub.docker.com/_/debian) debian:buster.
+Docker image based on [official Ubuntu 20.04 image](https://hub.docker.com/_/ubuntu) ubuntu:20.04.
 
-Used as base for `Substrate`-based CI images.
+Used as a base for our CI images.
 
-Our base CI image `<base-ci-linux:latest>`.
+Our base CI image `<base-ci:latest>`.
 
 Used to build and test Substrate-based projects.
 
@@ -24,7 +24,7 @@ Used to build and test Substrate-based projects.
 - `ca-certificates`
 - `jq`
 
-[Click here](https://hub.docker.com/repository/docker/paritytech/base-ci-linux) for the registry.
+[Click here](https://hub.docker.com/repository/docker/paritytech/base-ci) for the registry.
 
 **Rust tools & toolchains:**
 
@@ -34,5 +34,5 @@ Used to build and test Substrate-based projects.
 ## Usage
 
 ```Dockerfile
-FROM docker.io/paritytech/base-ci-linux:latest
+FROM docker.io/paritytech/base-ci:latest
 ```

dockerfiles/ci-linux/Dockerfile

@@ -2,15 +2,15 @@ ARG VCS_REF=master
 ARG BUILD_DATE=""
 ARG REGISTRY_PATH=docker.io/paritytech
 
-FROM ${REGISTRY_PATH}/base-ci-linux:latest
+FROM ${REGISTRY_PATH}/base-ci:latest
 
 # metadata
 LABEL summary="Image for Substrate-based projects." \
 	name="${REGISTRY_PATH}/ci-linux" \
 	maintainer="devops-team@parity.io" \
-	version="1.0" \
-	description="Inherits from base-ci-linux; chromium-driver, \
-wasm-gc, wasm-bindgen-cli, wasm-pack, cargo-audit, cargo-web, cargo-deny " \
+	version="2.0" \
+	description="Inherits from paritytech/base-ci; \
+wasm-gc, wasm-bindgen-cli, wasm-pack, cargo-deny " \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\
 dockerfiles/ci-linux/Dockerfile" \
@@ -21,9 +21,6 @@ dockerfiles/ci-linux/README.md" \
 
 # install tools and dependencies
 RUN set -eux && \
-	apt-get -y update && \
-	apt-get install -y --no-install-recommends \
-		chromium-driver && \
 # install `rust-src` component for ui test
 	rustup component add rust-src && \
 # install specific Rust nightly, default is stable, use minimum components
@@ -44,10 +41,6 @@ RUN set -eux && \
 # versions
 	rustup show && \
 	cargo --version && \
-# apt clean up
-	apt-get autoremove -y && \
-	apt-get clean && \
-	rm -rf /var/lib/apt/lists/* && \
 # cargo clean up
 # removes compilation artifacts cargo install creates (>250M)
 	rm -rf "${CARGO_HOME}/registry" "${CARGO_HOME}/git" /root/.cache/sccache

dockerfiles/ci-linux/README.md

@@ -1,17 +1,16 @@
 # ci-linux
 
-Docker image based on our base CI image `<base-ci-linux:latest>`.
+Docker image based on our base CI image `<base-ci:latest>`.
 
 Used to build and test Substrate-based projects.
 
 ## Dependencies and Tools
 
-- `chromium-driver`
-
-**Inherited from `<base-ci-linux:latest>`:**
+**Inherited from `<base-ci:latest>`:**
 
 - `libssl-dev`
-- `clang-7`
+- `clang-10`
+- `clang++-10`
 - `lld`
 - `libclang-dev`
 - `make`
@@ -22,6 +21,7 @@ Used to build and test Substrate-based projects.
 - `time`
 - `rhash`
 - `ca-certificates`
+- `jq`
 
 **Rust versions:**
 
@@ -30,12 +30,12 @@ Used to build and test Substrate-based projects.
 
 **Rust tools & toolchains:**
 
-- `cargo-web`
 - `sccache`
 - `wasm-pack`
 - `wasm-bindgen`
+- `wasm-gc`
 - `cargo-deny`
-- `cargo-spellcheck`: Required for the CI to do automated spell-checking.
+- `cargo-spellcheck`: Required for the CI to do automated spell-checking
 - `wasm32-unknown-unknown` toolchain
 
 [Click here](https://hub.docker.com/repository/docker/paritytech/ci-linux) for the registry.