From 6ce053ff02113aab0569ec58e2afc1c1d98ce218 Mon Sep 17 00:00:00 2001 From: Michael de Hoog Date: Mon, 28 Oct 2024 08:22:26 -1000 Subject: [PATCH] Fix build --- testnet/Dockerfile | 5 ++++- testnet/docker-compose.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/testnet/Dockerfile b/testnet/Dockerfile index e9124a6..7dada4b 100644 --- a/testnet/Dockerfile +++ b/testnet/Dockerfile @@ -17,6 +17,9 @@ FROM golang:1.22 AS op-enclave WORKDIR /app +COPY op-enclave/go.mod op-enclave/go.sum op-enclave/ +RUN cd op-enclave && go mod download + COPY go.mod go.sum ./ RUN go mod download @@ -26,7 +29,7 @@ COPY op-batcher/ op-batcher/ COPY op-da/ op-da/ COPY op-proposer/ op-proposer/ -RUN go build -o bin/op-enclave ./op-enclave/cmd/enclave +RUN cd op-enclave && go build -o ../bin/op-enclave ./cmd/enclave RUN go build -o bin/op-batcher ./op-batcher/cmd RUN go build -o bin/op-proposer ./op-proposer/cmd RUN go build -o bin/op-da ./op-da/cmd diff --git a/testnet/docker-compose.yml b/testnet/docker-compose.yml index a6aad7c..196d892 100644 --- a/testnet/docker-compose.yml +++ b/testnet/docker-compose.yml @@ -2,7 +2,7 @@ services: op-geth: build: context: .. - dockerfile: /Dockerfile + dockerfile: testnet/Dockerfile ports: - "8545:8545" command: [ "bash", "./entrypoint-geth.sh" ] @@ -13,7 +13,7 @@ services: op-node: build: context: .. - dockerfile: /Dockerfile + dockerfile: testnet/Dockerfile depends_on: - op-geth - op-da @@ -25,7 +25,7 @@ services: op-da: build: context: .. - dockerfile: /Dockerfile + dockerfile: testnet/Dockerfile command: [ "bash", "./entrypoint-da.sh" ] volumes: - ./data/da:/data @@ -34,7 +34,7 @@ services: op-batcher: build: context: .. - dockerfile: /Dockerfile + dockerfile: testnet/Dockerfile depends_on: - op-geth - op-node @@ -44,7 +44,7 @@ services: op-proposer: build: context: .. - dockerfile: /Dockerfile + dockerfile: testnet/Dockerfile depends_on: - op-geth - op-node @@ -54,7 +54,7 @@ services: op-enclave: build: context: .. - dockerfile: /Dockerfile + dockerfile: testnet/Dockerfile command: [ "bash", "./entrypoint-enclave.sh" ] env_file: - .env