Skip to content

Commit f47ecdf

Browse files
authored
Update solana image selection logic (#2219)
* Updated solana image selection logic to use runtime arch * Swapped out f4hrenh9it solana image
1 parent 2fcbdd8 commit f47ecdf

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

book/src/framework/components/blockchains/solana.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
Since `Solana` doesn't have official image for `arm64` we built it, images we use are:
44
```
5-
amd64 solanalabs/solana:v1.18.26 - used in CI
6-
arm64 f4hrenh9it/solana:latest - used locally
5+
amd64 solanalabs/solana:v1.18.26
6+
arm64 public.ecr.aws/w0i8p0z9/solana-validator:main-1dcdbc4
77
```
88

99
## Configuration

framework/.changeset/v0.11.7.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Updated solana image selection logic to use runtime arch

framework/components/blockchain/solana.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66
"os"
77
"path/filepath"
8+
"runtime"
89
"strconv"
910
"strings"
1011
"time"
@@ -31,12 +32,13 @@ var idJSONRaw = `
3132
`
3233

3334
func defaultSolana(in *Input) {
34-
ci := os.Getenv("CI") == "true"
35-
if in.Image == "" && !ci {
36-
in.Image = "f4hrenh9it/solana"
37-
}
38-
if in.Image == "" && ci {
39-
in.Image = "anzaxyz/agave:v2.1.13"
35+
if in.Image == "" {
36+
// Official arm64 image does not exist for Solana so use custom built one
37+
if runtime.GOARCH == "arm64" {
38+
in.Image = "public.ecr.aws/w0i8p0z9/solana-validator:main-1dcdbc4"
39+
} else {
40+
in.Image = "anzaxyz/agave:v2.1.13"
41+
}
4042
}
4143
if in.Port == "" {
4244
in.Port = "8999"

0 commit comments

Comments
 (0)