Skip to content

Commit 9183f08

Browse files
swaroop-osecswaroop-osec
authored
feat: Add new Anza Dockerfiles and Rust 2024 edition support (#226)
- Added Dockerfiles for Agave `v2.2.5`, `v3.0.8-v3.0.14`, and `v3.1.1-v3.1.7` - `cargo_toml` crate was updated from 0.15.3 → 0.22.3, which includes support for the E2024 edition
1 parent d3811ef commit 9183f08

18 files changed

+246
-37
lines changed

‎Cargo.lock‎

Lines changed: 48 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "solana-verify"
3-
version = "0.4.12"
3+
version = "0.4.13"
44
edition = "2021"
55
description = "A CLI tool for building verifiable Solana programs"
66
license = "MIT"
@@ -10,7 +10,7 @@ license = "MIT"
1010
anyhow = "1.0.79"
1111
borsh = { version = "1.2.1", features = ["derive"] }
1212
cargo-lock = "10.1.0" # missing in workspace
13-
cargo_toml = "0.15.3" # missing in workspace
13+
cargo_toml = "0.22" # missing in workspace
1414
clap = "2.33.1" # version of v1.18 does not support derive
1515
crossbeam-channel = "0.5.11"
1616
hex = "0.4.3"

‎docker/v2.2.5.Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM --platform=linux/amd64 rust@sha256:479476fa1dec14dfa9ed2dbcaa94cda5ab945e125d45c2d153267cc0135f3b69
2+
3+
RUN apt-get update && apt-get install -qy git gnutls-bin
4+
RUN sh -c "$(curl -sSfL https://release.anza.xyz/v2.2.5/install)"
5+
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
6+
# Call cargo build-sbf to trigger installation of associated platform tools
7+
RUN cargo init temp --edition 2021 && \
8+
cd temp && \
9+
cargo build-sbf && \
10+
rm -rf temp
11+
WORKDIR /build
12+
13+
CMD /bin/bash

‎docker/v3.0.10.Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
2+
3+
RUN apt-get update && apt-get install -qy git gnutls-bin
4+
RUN sh -c "$(curl -sSfL https://release.anza.xyz/v3.0.10/install)"
5+
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
6+
# Call cargo build-sbf to trigger installation of associated platform tools
7+
RUN cargo init temp --edition 2021 && \
8+
cd temp && \
9+
cargo build-sbf && \
10+
rm -rf temp
11+
WORKDIR /build
12+
13+
CMD /bin/bash

‎docker/v3.0.11.Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
2+
3+
RUN apt-get update && apt-get install -qy git gnutls-bin
4+
RUN sh -c "$(curl -sSfL https://release.anza.xyz/v3.0.11/install)"
5+
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
6+
# Call cargo build-sbf to trigger installation of associated platform tools
7+
RUN cargo init temp --edition 2021 && \
8+
cd temp && \
9+
cargo build-sbf && \
10+
rm -rf temp
11+
WORKDIR /build
12+
13+
CMD /bin/bash

‎docker/v3.0.12.Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
2+
3+
RUN apt-get update && apt-get install -qy git gnutls-bin
4+
RUN sh -c "$(curl -sSfL https://release.anza.xyz/v3.0.12/install)"
5+
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
6+
# Call cargo build-sbf to trigger installation of associated platform tools
7+
RUN cargo init temp --edition 2021 && \
8+
cd temp && \
9+
cargo build-sbf && \
10+
rm -rf temp
11+
WORKDIR /build
12+
13+
CMD /bin/bash

‎docker/v3.0.13.Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
2+
3+
RUN apt-get update && apt-get install -qy git gnutls-bin
4+
RUN sh -c "$(curl -sSfL https://release.anza.xyz/v3.0.13/install)"
5+
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
6+
# Call cargo build-sbf to trigger installation of associated platform tools
7+
RUN cargo init temp --edition 2021 && \
8+
cd temp && \
9+
cargo build-sbf && \
10+
rm -rf temp
11+
WORKDIR /build
12+
13+
CMD /bin/bash

‎docker/v3.0.14.Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
2+
3+
RUN apt-get update && apt-get install -qy git gnutls-bin
4+
RUN sh -c "$(curl -sSfL https://release.anza.xyz/v3.0.14/install)"
5+
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
6+
# Call cargo build-sbf to trigger installation of associated platform tools
7+
RUN cargo init temp --edition 2021 && \
8+
cd temp && \
9+
cargo build-sbf && \
10+
rm -rf temp
11+
WORKDIR /build
12+
13+
CMD /bin/bash

‎docker/v3.0.8.Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
2+
3+
RUN apt-get update && apt-get install -qy git gnutls-bin
4+
RUN sh -c "$(curl -sSfL https://release.anza.xyz/v3.0.8/install)"
5+
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
6+
# Call cargo build-sbf to trigger installation of associated platform tools
7+
RUN cargo init temp --edition 2021 && \
8+
cd temp && \
9+
cargo build-sbf && \
10+
rm -rf temp
11+
WORKDIR /build
12+
13+
CMD /bin/bash

‎docker/v3.0.9.Dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM --platform=linux/amd64 rust@sha256:878ca0e8df1305dcbbfffac5bb908cce6a4bc5f6b629c518e7112645ee8851d4
2+
3+
RUN apt-get update && apt-get install -qy git gnutls-bin
4+
RUN sh -c "$(curl -sSfL https://release.anza.xyz/v3.0.9/install)"
5+
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
6+
# Call cargo build-sbf to trigger installation of associated platform tools
7+
RUN cargo init temp --edition 2021 && \
8+
cd temp && \
9+
cargo build-sbf && \
10+
rm -rf temp
11+
WORKDIR /build
12+
13+
CMD /bin/bash

0 commit comments

Comments
 (0)