Fixed cargo issues.

yetanotherco · Oct 24, 2024 · 35b9c20 · 35b9c20
1 parent faeceed
commit 35b9c20
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/docker/aggregator.Dockerfile b/docker/aggregator.Dockerfile
@@ -9,6 +9,7 @@ COPY core         ./core
 COPY metrics      ./metrics
 COPY contracts/bindings/ ./contracts/bindings
 
+RUN go get github.com/ethereum/go-ethereum@latest
 RUN go build -o ./aligned-layer-aggregator aggregator/cmd/main.go
 
 FROM debian:bookworm-slim

diff --git a/docker/aligned_base.Dockerfile b/docker/aligned_base.Dockerfile
@@ -85,6 +85,7 @@ FROM base AS builder
 
 ENV RELEASE_FLAG=--release
 ENV TARGET_REL_PATH=release
+ENV CARGO_NET_GIT_FETCH_WITH_CLI=true
 
 COPY operator/ /aligned_layer/operator/
 COPY batcher/ /aligned_layer/batcher/
@@ -93,7 +94,7 @@ COPY batcher/ /aligned_layer/batcher/
 COPY --from=chef_builder /aligned_layer/operator/sp1/lib/target/ /aligned_layer/operator/sp1/lib/target/
 WORKDIR /aligned_layer/operator/sp1/lib
 RUN cargo build ${RELEASE_FLAG}
-RUN cp /aligned_layer/operator/sp1/lib/target/${TARGET_REL_PATH}/libsp1_verifier_ffi.so /aligned_layer/operator/sp1/lib/libsp1_verifier_ffi.so
+RUN cp /aligned_layer/operator/sp1/lib/target/${TARGET_REL_PATH}/libsp1_verifier_ffi.so /aligned_layer/operator/sp1/lib/libsp1_verifier.so
 
 # build_risc_zero_linux
 COPY --from=chef_builder /aligned_layer/operator/risc_zero/lib/target/ /aligned_layer/operator/risc_zero/lib/target/

diff --git a/docker/batcher.Dockerfile b/docker/batcher.Dockerfile
@@ -33,7 +33,7 @@ WORKDIR /aligned_layer/batcher/aligned/
 RUN cargo chef cook --release --recipe-path /aligned_layer/batcher/aligned/recipe.json
 
 FROM base AS builder
-COPY batcher/ /aligned_layer/batcher
+COPY . /aligned_layer/
 
 COPY --from=chef_builder /aligned_layer/batcher/aligned-batcher/target/ /aligned_layer/batcher/aligned-batcher/target/
 WORKDIR /aligned_layer/batcher/aligned-batcher/
@@ -62,4 +62,4 @@ COPY ./config-files/anvil.batcher.ecdsa.key.json ./config-files/
 
 RUN apt update -y && apt install -y libssl-dev ca-certificates
 
-CMD ["aligned-batcher", "--config", "./config-files/config-batcher-docker.yaml"]
+CMD ["aligned-batcher", "--config", "./config-files/config-batcher-docker.yaml"]