From 080aa415a0a5c4ec9993e51b71639edd21fd2aae Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 19 Dec 2024 15:06:49 -0300 Subject: [PATCH] Update docker file --- ci/docker/sbf-solana-solana/Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/docker/sbf-solana-solana/Dockerfile b/ci/docker/sbf-solana-solana/Dockerfile index d60cc649..039ecd55 100644 --- a/ci/docker/sbf-solana-solana/Dockerfile +++ b/ci/docker/sbf-solana-solana/Dockerfile @@ -1,23 +1,23 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 RUN apt-get update && \ apt-get install -y --no-install-recommends \ curl \ - gcc libc6-dev ca-certificates + gcc libc6-dev ca-certificates bzip2 ENV RUSTUP_INIT_SKIP_PATH_CHECK="yes" RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y -v --no-modify-path RUN cp ${HOME}/.cargo/bin/* /usr/local/bin/ -RUN cargo install --git https://github.com/solana-labs/cargo-run-solana-tests.git \ - --rev df2f642924aee7bbd2566017b3d71cb0c389b015 \ +RUN cargo install --git https://github.com/anza-xyz/cargo-run-solana-tests.git \ + --rev d6ae9918ef1bc1049dabc2ded490460515f777d4 \ --bin cargo-run-solana-tests --root /usr/local -RUN mkdir -p /tmp/.cache/solana/v1.38/platform-tools -RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/solana-labs/platform-tools/releases/download/v1.38/platform-tools-linux-x86_64.tar.bz2 -RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.38/platform-tools -RUN rustup toolchain link solana /tmp/.cache/solana/v1.38/platform-tools/rust +RUN mkdir -p /tmp/.cache/solana/v1.43/platform-tools +RUN curl -L -o platform-tools-linux-x86_64.tar.bz2 https://github.com/anza-xyz/platform-tools/releases/download/v1.43/platform-tools-linux-x86_64.tar.bz2 +RUN tar -xjf platform-tools-linux-x86_64.tar.bz2 --strip-components 1 -C /tmp/.cache/solana/v1.43/platform-tools +RUN rustup toolchain link solana /tmp/.cache/solana/v1.43/platform-tools/rust RUN cp -R ${HOME}/.rustup /tmp/ ENV CARGO_TARGET_SBF_SOLANA_SOLANA_RUNNER="cargo-run-solana-tests --heap-size 104857600" -ENV CC="/tmp/.cache/solana/v1.38/platform-tools/llvm/bin/clang" +ENV CC="/tmp/.cache/solana/v1.43/platform-tools/llvm/bin/clang" ENV RUSTUP_TOOLCHAIN="solana"