From 30956a24edabaeb0371443f17fbd609fac062b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C5=A1a=20Pul?= <4625220+codespool@users.noreply.github.com> Date: Wed, 9 Aug 2023 22:48:00 +0300 Subject: [PATCH 1/2] Update Dockerfile --- base-image/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/base-image/Dockerfile b/base-image/Dockerfile index 207f9e25..a885c91e 100644 --- a/base-image/Dockerfile +++ b/base-image/Dockerfile @@ -1,7 +1,7 @@ # Start from the base image FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/base:ubuntu-22.04 -LABEL org.opencontainers.image.source=https://github.com/AstarNetwork/swanky-cli +LABEL org.opencontainers.image.source=https://github.com/swankyhub/swanky-cli # Update the package lists RUN apt-get update @@ -13,18 +13,18 @@ RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && apt-get install - RUN apt-get install -y binaryen pkg-config libssl-dev # Download and install swanky-cli and verify the installation -RUN curl -L https://github.com/AstarNetwork/swanky-cli/releases/download/v3.0.4/swanky-v3.0.4-be91475-linux-x64.tar.gz | tar xz -C /opt && \ +RUN curl -L https://github.com/swankyhub/swanky-cli/releases/download/v3.0.4/swanky-v3.0.4-be91475-linux-x64.tar.gz | tar xz -C /opt && \ ln -s /opt/swanky/bin/swanky /usr/local/bin/swanky # Install Rustup and Rust, additional components, packages, and verify the installations RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ /bin/bash -c "source $HOME/.cargo/env && \ - rustup toolchain install nightly-2023-02-07 && \ - rustup default nightly-2023-02-07 && \ - rustup component add rust-src --toolchain nightly-2023-02-07 && \ - rustup target add wasm32-unknown-unknown --toolchain nightly-2023-02-07 && \ + rustup toolchain install nightly-2023-03-05 && \ + rustup default nightly-2023-03-05 && \ + rustup component add rust-src --toolchain nightly-2023-03-05 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-05 && \ cargo install cargo-dylint dylint-link && \ - cargo install cargo-contract --force --version 2.2.1 && \ + cargo install cargo-contract --force --version 4.0.0-alpha && \ rustc --version" # Install Yarn 1.x @@ -39,4 +39,4 @@ RUN node --version && \ yarn --version # Clean up the package lists to reduce image size -RUN apt-get clean && rm -rf /var/lib/apt/lists/* \ No newline at end of file +RUN apt-get clean && rm -rf /var/lib/apt/lists/* From b9348a0199d8c2421ca704a6a7b400f5ee3a8b58 Mon Sep 17 00:00:00 2001 From: PierreOssun Date: Thu, 10 Aug 2023 09:54:13 +0200 Subject: [PATCH 2/2] fixed script --- base-image/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base-image/Dockerfile b/base-image/Dockerfile index a885c91e..fe8e19e4 100644 --- a/base-image/Dockerfile +++ b/base-image/Dockerfile @@ -23,8 +23,8 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ rustup default nightly-2023-03-05 && \ rustup component add rust-src --toolchain nightly-2023-03-05 && \ rustup target add wasm32-unknown-unknown --toolchain nightly-2023-03-05 && \ - cargo install cargo-dylint dylint-link && \ - cargo install cargo-contract --force --version 4.0.0-alpha && \ + cargo +stable install cargo-dylint dylint-link && \ + cargo +stable install cargo-contract --force --version 4.0.0-alpha && \ rustc --version" # Install Yarn 1.x