Skip to content

Commit a45bcbc

Browse files
authored
chore: fix ethereum dependency (#618)
* Fix ethereum dependency * Copy forge to /usr/local/bin
1 parent 5d0da91 commit a45bcbc

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

Dockerfile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
FROM ubuntu:24.04
22

3+
COPY bin /build-bin
4+
35
RUN apt-get update \
4-
&& apt-get install -y make curl git software-properties-common jq \
5-
&& add-apt-repository -y ppa:longsleep/golang-backports \
6-
&& add-apt-repository -y ppa:ethereum/ethereum \
7-
&& apt-get update \
8-
&& apt-get install -y golang-1.22 ethereum=1.14.5+build29958+noble \
9-
&& curl -L https://foundry.paradigm.xyz | bash \
10-
&& /root/.foundry/bin/foundryup
11-
12-
RUN cp -R /root/.foundry/bin/* /usr/local/bin/
6+
&& apt-get install -y make curl git software-properties-common jq sudo
7+
8+
RUN /build-bin/install-deps.sh
139

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ install-hooks:
88
.PHONY: install-deps
99
install-deps:
1010
./bin/install-deps.sh
11-
foundryup
1211

1312
.PHONY: deps
1413
deps: install-hooks install-deps

bin/install-deps.sh

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,36 @@
11
#!/usr/bin/env bash
22

33
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
4+
ARCH=$(uname -a | tr '[:upper:]' '[:lower:]')
5+
6+
linuxAmd64="https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.14.6-aadddf3a.tar.gz"
7+
linuxArm64="https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-arm64-1.14.5-0dd173a7.tar.gz"
8+
49

510
if [[ "$OS" == "linux" ]]; then
611
sudo apt-get update
712
sudo apt-get install -y make curl git software-properties-common jq
8-
sudo add-apt-repository -y ppa:ethereum/ethereum
9-
sudo apt-get update
10-
sudo apt-get install ethereum=1.14.5+build29958+noble
11-
curl -L https://foundry.paradigm.xyz | bash
13+
14+
if [[ $ARCH == *"x86_64"* ]]; then
15+
curl -L $linuxAmd64 | tar -xz
16+
elif [[ $ARCH == *"aarch64"* ]]; then
17+
curl -L $linuxArm64 | tar -xz
18+
else
19+
echo "Unsupported architecture: $ARCH"
20+
exit 1
21+
fi
1222
elif [[ "$OS" == "darwin" ]]; then
1323
brew tap ethereum/ethereum
1424
brew install libusb ethereum@1.14.5
15-
curl -L https://foundry.paradigm.xyz | bash
1625
else
1726
echo "Unsupported OS: $OS"
1827
exit 1
1928
fi
29+
30+
curl -L https://foundry.paradigm.xyz | bash
31+
32+
cp -R /root/.foundry/bin/* /usr/local/bin/
33+
34+
foundryup
35+
36+
cp -R /root/.foundry/bin/* /usr/local/bin/

0 commit comments

Comments
 (0)