Update solang and canvas-node in contracts CI image (#237)

* change (dockerfile): remove solang from contracts image

* change (dockerfile): remove canvas-node since it fails to compile now

* change (dockerfile): add gpg key for llvm

* change (dockerfile): update metadata

* change (CI): add canvas-node bin, new solang version

* change (CI): return  zlib1g-dev

* change (dockerfile): adddefault shell

* image: add python3 and update solang

* image: downgrade solang

Author: TriplEight

dockerfiles/contracts-ci-linux/Dockerfile

@@ -9,15 +9,21 @@ LABEL io.parity.image.authors="[email protected]" \
 	io.parity.image.vendor="Parity Technologies" \
 	io.parity.image.title="${REGISTRY_PATH}/contracts-ci-linux" \
 	io.parity.image.description="Inherits from base-ci-linux:latest. \
-llvm-8-dev, clang-8, zlib1g-dev, npm, yarn, wabt, unzip. \
-rust nightly, rustfmt, rust-src" \
+llvm-8-dev, clang-8, python3, zlib1g-dev, npm, yarn, wabt. \
+rust nightly, rustfmt, rust-src, solang, canvas-node" \
 	io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/\
 dockerfiles/contracts-ci-linux/Dockerfile" \
 	io.parity.image.documentation="https://github.com/paritytech/scripts/blob/${VCS_REF}/\
 dockerfiles/contracts-ci-linux/README.md" \
 	io.parity.image.revision="${VCS_REF}" \
 	io.parity.image.created="${BUILD_DATE}"
 
+WORKDIR /builds
+
+ENV SHELL /bin/bash
+
+ENV CXX="/usr/bin/clang++-8"
+
 # copy llvm and yarn repo key
 COPY utility/debian-llvm-clang.key /etc/apt/trusted.gpg.d/debian-archive-llvm.gpg
 COPY utility/yarn.key /etc/apt/trusted.gpg.d/debian-yarn.gpg
@@ -33,24 +39,32 @@ RUN set -eux; \
 	apt-get -y update; \
 	apt-get remove -y --purge clang; \
 	apt-get install -y --no-install-recommends \
-		llvm-8-dev clang-8 zlib1g-dev npm yarn wabt unzip; \
-# set a link to clang-8
+		 zlib1g-dev llvm-8-dev clang-8 python3 npm yarn wabt; \
+# set links to clang-8 and python3
+	update-alternatives --install /usr/bin/python python /usr/bin/python3 100; \
 	update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 100; \
 	update-alternatives --install /usr/bin/cc cc /usr/bin/clang-8 100; \
+	update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-8 100; \
 # Installs the latest common nightly for the listed components,
 # adds those components, wasm target and sets the profile to minimal
 	rustup toolchain install nightly --target wasm32-unknown-unknown \
-			--profile minimal --component rustfmt rust-src; \
+		--profile minimal --component rustfmt rust-src; \
 	rustup default nightly; \
 	cargo install pwasm-utils-cli --bin wasm-prune; \
 	cargo install cargo-contract; \
-	cargo install --git https://github.com/hyperledger-labs/solang --tag m7; \
-	cargo install --git https://github.com/paritytech/canvas-node --tag v0.1.2; \
+# tried v0.1.5 and the latest master - both fail with https://github.com/hyperledger-labs/solang/issues/314
+	cargo install --git https://github.com/hyperledger-labs/solang --tag v0.1.2; \
+# download the latest canvas-node binary
+	curl -L "https://gitlab.parity.io/parity/canvas-node/-/jobs/artifacts/master/raw/artifacts/canvas/canvas?job=build" \
+		-o /usr/local/cargo/bin/canvas; \
+	chmod +x /usr/local/cargo/bin/canvas; \
 # versions
 	yarn --version; \
 	rustup show; \
 	cargo --version; \
 	solang --version; \
+	canvas --version; \
+	python --version; \
 # cargo clean up
 # removes compilation artifacts cargo install creates (>250M)
 	rm -rf "${CARGO_HOME}/registry" "${CARGO_HOME}/git" /root/.cache/sccache; \

dockerfiles/contracts-ci-linux/README.md

@@ -9,10 +9,10 @@ Used to build and test contracts!.
 - `llvm-8-dev`
 - `clang-8`
 - `zlib1g-dev`
+- `python3`
 - `npm`
 - `yarn`
 - `wabt`
-- `unzip`
 
 **Inherited from `<base-ci-linux:latest>`:**
 
@@ -40,6 +40,7 @@ We always try to use the [latest possible](https://rust-lang.github.io/rustup-co
 - `cargo-contract`
 - `pwasm-utils-cli`
 - `solang`
+- `canvas-node`
 - `wasm32-unknown-unknown`: The toolchain to compile Rust codebases for Wasm.
 
 [Click here](https://hub.docker.com/repository/docker/paritytech/contracts-ci-linux) for the registry.

dockerfiles/ink-ci-linux/Dockerfile

@@ -18,6 +18,7 @@ dockerfiles/ink-ci-linux/README.md" \
 	io.parity.image.created="${BUILD_DATE}"
 
 WORKDIR /builds
+
 ENV SHELL /bin/bash
 
 RUN	set -eux; \