Skip to content

Commit 1db7476

Browse files
committed
chore(build): update base image
1 parent 9144df2 commit 1db7476

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

.github/workflows/fhevm-geth-coprocessor.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ jobs:
2323
with:
2424
working-directory: "."
2525
# ${{ github.event_name == 'release' || github.ref_name == 'main' }}
26-
push_image: true
27-
image-name: "go-coprocessor-devnode"
28-
generate-dev-image: false
29-
docker-file: "Dockerfile.devnode"
26+
push_image: false
27+
image-name: "go-ethereum-coprocessor"
28+
image-dev-name: "go-ethereum-coprocessor-dev"
29+
generate-dev-image: true
30+
docker-file: "Dockerfile"
31+
docker-file-dev: "Dockerfile.dev"
32+
image-dev-description: "geth coprocessor dev image"
3033
arm-build: true
3134

3235
secrets:

Dockerfile.devnode Dockerfile.dev

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
ARG ZBC_VERSION=latest
2-
FROM ghcr.io/zama-ai/zama-zbc-build:${ZBC_VERSION} AS build
1+
FROM golang:1.22-alpine AS build
32

43
# Use ARG values for tool versions
54
ARG TARGETARCH
65
ARG GETH_NODE_VERSION=v1.14.3
76
ARG PRYSM_VERSION=v5.0.3
87

98
# Install dependencies
10-
RUN apt-get update &&\
11-
apt-get install -y --no-install-recommends git git-lfs
9+
RUN apk update &&\
10+
apk add --no-cache \
11+
gcc g++ make musl-dev linux-headers git git-lfs
1212

1313
# Download and set up Prysm binaries
1414
ADD https://github.com/prysmaticlabs/prysm/releases/download/${PRYSM_VERSION}/beacon-chain-${PRYSM_VERSION}-linux-${TARGETARCH} /usr/bin/prysm-beacon
1515
ADD https://github.com/prysmaticlabs/prysm/releases/download/${PRYSM_VERSION}/validator-${PRYSM_VERSION}-linux-${TARGETARCH} /usr/bin/prysm-validator
1616
ADD https://github.com/prysmaticlabs/prysm/releases/download/${PRYSM_VERSION}/prysmctl-${PRYSM_VERSION}-linux-${TARGETARCH} /usr/bin/prysm-ctl
1717
RUN chmod +x /usr/bin/prysm-beacon /usr/bin/prysm-validator /usr/bin/prysm-ctl
1818

19-
WORKDIR /src/geth
19+
WORKDIR /go-ethereum
2020

2121
# Copy and build the Geth source code
2222
COPY . .
2323
RUN go build ./cmd/bootnode && make geth
2424

2525
# Set up final image
26-
FROM ghcr.io/zama-ai/zama-zbc-build:${ZBC_VERSION}
26+
FROM alpine:3.20.3
2727

2828
# Create necessary directories
2929
RUN mkdir -p /val-data /rpc-data /usr/share/devnet-resources /val-data/consensus/beacondata/network-keys
3030

3131
# Copy built binaries and scripts from build
32-
COPY --from=build /src/geth/bootnode /usr/bin/
33-
COPY --from=build /src/geth/build/bin/geth /usr/bin/
32+
COPY --from=build /go-ethereum/bootnode /usr/bin/
33+
COPY --from=build /go-ethereum/build/bin/geth /usr/bin/
3434
COPY --from=build /usr/bin/prysm-beacon /usr/bin/prysm-validator /usr/bin/prysm-ctl /usr/bin/
3535

3636
# Copy config files and scripts
37-
COPY --from=build /src/geth/local-testnet/prep/execution/genesis.json /usr/share/devnet-resources/
38-
COPY --from=build /src/geth/local-testnet/prep/boot.key /usr/share/devnet-resources/
39-
COPY --from=build /src/geth/local-testnet/prep/node1/keystore/ /val-data/keystore/
40-
COPY --from=build /src/geth/local-testnet/prep/consensus/config.yml /usr/share/devnet-resources/consensus-config.yml
41-
COPY --from=build /src/geth/local-testnet/prep/consensus/validator-beacon-static-network-keys /val-data/consensus/beacondata/network-keys
42-
COPY --from=build /src/geth/scripts/run-single-node-devnet.sh /entrypoint.sh
43-
COPY --from=build /src/geth/scripts/faucet.sh /usr/bin/faucet
37+
COPY --from=build /go-ethereum/local-testnet/prep/execution/genesis.json /usr/share/devnet-resources/
38+
COPY --from=build /go-ethereum/local-testnet/prep/boot.key /usr/share/devnet-resources/
39+
COPY --from=build /go-ethereum/local-testnet/prep/node1/keystore/ /val-data/keystore/
40+
COPY --from=build /go-ethereum/local-testnet/prep/consensus/config.yml /usr/share/devnet-resources/consensus-config.yml
41+
COPY --from=build /go-ethereum/local-testnet/prep/consensus/validator-beacon-static-network-keys /val-data/consensus/beacondata/network-keys
42+
COPY --from=build /go-ethereum/scripts/run-single-node-devnet.sh /entrypoint.sh
43+
COPY --from=build /go-ethereum/scripts/faucet.sh /usr/bin/faucet
4444

4545
WORKDIR /
4646

0 commit comments

Comments
 (0)