From dea00dad5cf293548f72fd9b5cd7308d9ad20e40 Mon Sep 17 00:00:00 2001 From: deuszx Date: Fri, 17 Nov 2023 19:42:28 +0100 Subject: [PATCH 1/5] Use ink-wrapper fork for aleph-node@12.1 compat --- Dockerfile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b05ee9..3c6e0f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,21 +4,19 @@ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ RUST_VERSION=1.71.0 \ - CARGO_CONTRACT_VERSION=3.2.0 \ - INK_WRAPPER_VERSION=0.6.1 + CARGO_CONTRACT_VERSION=3.2.0 LABEL cargo-contract="$CARGO_CONTRACT_VERSION" \ - rust="$RUST_VERSION" \ - ink-wrapper="$INK_WRAPPER_VERSION" + rust="$RUST_VERSION" # Minimal Rust dependencies. RUN set -eux \ && apt-get update && apt-get -y install wget \ && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) rustArch='x86_64-unknown-linux-gnu' ;; \ - arm64) rustArch='aarch64-unknown-linux-gnu' ;; \ - *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ + amd64) rustArch='x86_64-unknown-linux-gnu' ;; \ + arm64) rustArch='aarch64-unknown-linux-gnu' ;; \ + *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac \ && url="https://static.rust-lang.org/rustup/dist/${rustArch}/rustup-init" \ && wget "$url" \ @@ -64,7 +62,7 @@ RUN rm -rf cargo-contract FROM slimmed-rust as ink-wrapper-builder RUN rustup toolchain install nightly-2023-04-20 \ - && cargo +nightly-2023-04-20 install ink-wrapper --version ${INK_WRAPPER_VERSION} --locked --force + && cargo +nightly-2023-04-20 install ink-wrapper --git https://github.com/Cardinal-Cryptography/ink-wrapper.git --branch aleph-client-compat --locked --force # # ink! 4.0 optimizer From 72fe0c342351ea01c30ba637919b765d0dd5f222 Mon Sep 17 00:00:00 2001 From: deuszx Date: Fri, 17 Nov 2023 19:48:18 +0100 Subject: [PATCH 2/5] Add labels to docker image --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c6e0f2..0068bcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,9 +14,9 @@ RUN set -eux \ && apt-get update && apt-get -y install wget \ && dpkgArch="$(dpkg --print-architecture)" \ && case "${dpkgArch##*-}" in \ - amd64) rustArch='x86_64-unknown-linux-gnu' ;; \ - arm64) rustArch='aarch64-unknown-linux-gnu' ;; \ - *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ + amd64) rustArch='x86_64-unknown-linux-gnu' ;; \ + arm64) rustArch='aarch64-unknown-linux-gnu' ;; \ + *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \ esac \ && url="https://static.rust-lang.org/rustup/dist/${rustArch}/rustup-init" \ && wget "$url" \ From 1c65f5f9c6bbbd97cfb39eca426c7ea402bf4d79 Mon Sep 17 00:00:00 2001 From: deuszx Date: Mon, 20 Nov 2023 21:11:20 +0100 Subject: [PATCH 3/5] Tag with r12.1 release --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4908cc5..df9be34 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ MAKEFILE_NAME := Ink development docker DOCKER_NAME_INK_DEV := cardinal-cryptography/ink-dev -DOCKER_TAG := 1.8.0 +DOCKER_TAG := 1.8.0-r12.1 # Native arch BUILDARCH := $(shell uname -m) From 1d6b106d2331337277475791971f1dfeac154053 Mon Sep 17 00:00:00 2001 From: deuszx Date: Thu, 23 Nov 2023 09:59:11 +0100 Subject: [PATCH 4/5] Use ink-wrapper revision/commit when isntalling. --- Dockerfile | 8 +++++--- Makefile | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0068bcf..44703eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,12 @@ ENV RUSTUP_HOME=/usr/local/rustup \ CARGO_HOME=/usr/local/cargo \ PATH=/usr/local/cargo/bin:$PATH \ RUST_VERSION=1.71.0 \ - CARGO_CONTRACT_VERSION=3.2.0 + CARGO_CONTRACT_VERSION=3.2.0 \ + INK_WRAPPER_VERSION=57fde9f0e31f1de610efe1879715c028849f4bc0 LABEL cargo-contract="$CARGO_CONTRACT_VERSION" \ - rust="$RUST_VERSION" + rust="$RUST_VERSION" \ + ink-wrapper="rev-$INK_WRAPPER_VERSION" # Minimal Rust dependencies. RUN set -eux \ @@ -62,7 +64,7 @@ RUN rm -rf cargo-contract FROM slimmed-rust as ink-wrapper-builder RUN rustup toolchain install nightly-2023-04-20 \ - && cargo +nightly-2023-04-20 install ink-wrapper --git https://github.com/Cardinal-Cryptography/ink-wrapper.git --branch aleph-client-compat --locked --force + && cargo +nightly-2023-04-20 install ink-wrapper --git https://github.com/Cardinal-Cryptography/ink-wrapper.git --rev ${INK_WRAPPER_VERSION} --locked --force # # ink! 4.0 optimizer diff --git a/Makefile b/Makefile index df9be34..374b1dd 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ MAKEFILE_NAME := Ink development docker DOCKER_NAME_INK_DEV := cardinal-cryptography/ink-dev -DOCKER_TAG := 1.8.0-r12.1 +DOCKER_TAG := 1.8.0-r12.1-57fde9 # Native arch BUILDARCH := $(shell uname -m) From f48ce24aab9e8131a0b582467551b5cd6c00c6ff Mon Sep 17 00:00:00 2001 From: deuszx Date: Thu, 23 Nov 2023 12:57:03 +0100 Subject: [PATCH 5/5] Bump docker tag to 2.0.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 374b1dd..e22cd54 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ MAKEFILE_NAME := Ink development docker DOCKER_NAME_INK_DEV := cardinal-cryptography/ink-dev -DOCKER_TAG := 1.8.0-r12.1-57fde9 +DOCKER_TAG := 2.0.0 # Native arch BUILDARCH := $(shell uname -m)