From 494bbee2196131558638089f1e0cdc80478a5e8d Mon Sep 17 00:00:00 2001
From: Kyrylo Stepanov <k.stepanov@tutanota.com>
Date: Fri, 6 Dec 2024 13:51:05 +0200
Subject: [PATCH] update sh scripts && Dockerfile to use more modern
 solana/rust versions

---
 Solana.Dockerfile  |  8 ++++----
 ci/rust-version.sh | 13 ++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Solana.Dockerfile b/Solana.Dockerfile
index ee0a8f6..05e35ad 100644
--- a/Solana.Dockerfile
+++ b/Solana.Dockerfile
@@ -1,4 +1,4 @@
-ARG SOLANA_VERSION=v1.18.11
+ARG SOLANA_VERSION=v2.0.15
 ARG RUST_VERSION=1.83.0
 FROM rust:$RUST_VERSION-bullseye as builder
 RUN apt-get update \
@@ -12,8 +12,8 @@ RUN apt-get update \
            linux-headers-generic \
            pkg-config \
            curl \
-          cmake \
-          protobuf-compiler
+           cmake \
+           protobuf-compiler \
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
@@ -26,7 +26,7 @@ COPY Cargo.lock /rust/
 WORKDIR /rust
 RUN cargo build --release
 
-FROM solanalabs/solana:$SOLANA_VERSION
+FROM anzaxyz/agave:$SOLANA_VERSION
 COPY --from=builder /rust/target/release/libplerkle.so /plugin/plugin.so      
 COPY ./docker .
 RUN chmod +x ./*.sh
diff --git a/ci/rust-version.sh b/ci/rust-version.sh
index d5d7b1e..864c5f3 100755
--- a/ci/rust-version.sh
+++ b/ci/rust-version.sh
@@ -23,21 +23,20 @@
 if [[ -n $RUST_VERSION ]]; then
   stable_version="$RUST_VERSION"
 else
-  stable_version=1.69.0
+  stable_version=latest
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2022-04-01
+  nightly_version=latest
 fi
 
 
 export rust_stable="$stable_version"
-export rust_stable_docker_image=solanalabs/rust:"$stable_version"
+export rust_stable_docker_image=rust:"$stable_version"
 
-export rust_nightly=nightly-"$nightly_version"
-export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
+export rust_nightly_docker_image=shepmaster/rust-nightly:"$nightly_version"
 
 [[ -z $1 ]] || (
   rustup_install() {
@@ -56,11 +55,11 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
     rustup_install "$rust_stable"
     ;;
   nightly)
-    rustup_install "$rust_nightly"
+    rustup_install "nightly"
     ;;
   all)
     rustup_install "$rust_stable"
-    rustup_install "$rust_nightly"
+    rustup_install "nightly"
     ;;
   *)
     echo "$0: Note: ignoring unknown argument: $1" >&2