Fix the docker file builds

sam-iamm · Feb 13, 2023 · 6f85148 · 6f85148
1 parent 218a5dd
commit 6f85148
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 45 deletions.
diff --git a/op-batcher/Dockerfile b/op-batcher/Dockerfile
@@ -2,14 +2,15 @@ FROM golang:1.18.0-alpine3.15 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
-# build op-batcher with local monorepo go modules
-COPY ./op-batcher/docker.go.work /app/go.work
+# build op-batcher with the shared go.mod & go.sum files
+COPY ./op-batcher /app/op-batcher
 COPY ./op-bindings /app/op-bindings
 COPY ./op-node /app/op-node
-COPY ./op-proposer /app/op-proposer
 COPY ./op-service /app/op-service
-COPY ./op-batcher /app/op-batcher
 COPY ./op-signer /app/op-signer
+COPY ./go.mod /app/go.mod
+COPY ./go.sum /app/go.sum
+
 COPY ./.git /app/.git
 
 WORKDIR /app/op-batcher

diff --git a/op-batcher/docker.go.work b/op-batcher/docker.go.work
diff --git a/op-chain-ops/Dockerfile b/op-chain-ops/Dockerfile
@@ -2,10 +2,11 @@ FROM golang:1.18.0-alpine3.15 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
-COPY ./op-chain-ops/docker.go.work /app/go.work
 COPY ./op-chain-ops /app/op-chain-ops
 COPY ./op-bindings /app/op-bindings
 COPY ./op-node /app/op-node
+COPY ./go.mod /app/go.mod
+COPY ./go.sum /app/go.sum
 COPY ./.git /app/.git
 
 WORKDIR /app/op-chain-ops

diff --git a/op-chain-ops/docker.go.work b/op-chain-ops/docker.go.work
diff --git a/op-node/Dockerfile b/op-node/Dockerfile
@@ -2,12 +2,13 @@ FROM golang:1.18.0-alpine3.15 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
-# build op-node with local monorepo go modules
-COPY ./op-node/docker.go.work /app/go.work
-COPY ./op-bindings /app/op-bindings
+# build op-node with the shared go.mod & go.sum files
 COPY ./op-node /app/op-node
 COPY ./op-chain-ops /app/op-chain-ops
 COPY ./op-service /app/op-service
+COPY ./op-bindings /app/op-bindings
+COPY ./go.mod /app/go.mod
+COPY ./go.sum /app/go.sum
 COPY ./.git /app/.git
 
 WORKDIR /app/op-node

diff --git a/op-node/docker.go.work b/op-node/docker.go.work
diff --git a/op-proposer/Dockerfile b/op-proposer/Dockerfile
@@ -2,13 +2,14 @@ FROM golang:1.18.0-alpine3.15 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
-# build op-proposer with local monorepo go modules
-COPY ./op-proposer/docker.go.work /app/go.work
+# build op-proposer with the shared go.mod & go.sum files
+COPY ./op-proposer /app/op-proposer
 COPY ./op-bindings /app/op-bindings
 COPY ./op-node /app/op-node
-COPY ./op-proposer /app/op-proposer
 COPY ./op-service /app/op-service
 COPY ./op-signer /app/op-signer
+COPY ./go.mod /app/go.mod
+COPY ./go.sum /app/go.sum
 COPY ./.git /app/.git
 
 WORKDIR /app/op-proposer

diff --git a/op-proposer/docker.go.work b/op-proposer/docker.go.work