Fix Makefile and Dockerfile

celo-org · Jun 18, 2024 · e7a40cf · e7a40cf
1 parent 861de54
commit e7a40cf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/docker-build-scan.yaml b/.github/workflows/docker-build-scan.yaml
@@ -23,8 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: detect-files-changed
     if: |
-      contains(needs.detect-files-changed.outputs.files-changed, 'op-chain-ops/cmd/celo-migrate-blocks') ||
-      contains(needs.detect-files-changed.outputs.files-changed, 'op-chain-ops/cmd/celo-migrate-state') ||
+      contains(needs.detect-files-changed.outputs.files-changed, 'op-chain-ops/cmd/celo-migrate') ||
       contains(needs.detect-files-changed.outputs.files-changed, 'op-chain-ops/Dockerfile')
     permissions:
       contents: read

diff --git a/op-chain-ops/Dockerfile b/op-chain-ops/Dockerfile
@@ -9,12 +9,12 @@ WORKDIR /app
 
 RUN go mod download
 
-COPY ./op-bindings /app/op-bindings
 COPY ./op-service /app/op-service
 COPY ./op-node /app/op-node
+COPY ./op-plasma /app/op-plasma
 COPY ./op-chain-ops /app/op-chain-ops
 WORKDIR /app/op-chain-ops
-RUN make celo-migrate-blocks celo-migrate-state
+RUN make celo-migrate
 
 FROM alpine:3.18
 RUN apk --no-cache add ca-certificates bash rsync
@@ -23,8 +23,7 @@ RUN apk --no-cache add ca-certificates bash rsync
 # USER app
 WORKDIR /app
 
-COPY --from=builder /app/op-chain-ops/bin/celo-migrate-blocks /app
-COPY --from=builder /app/op-chain-ops/bin/celo-migrate-state /app
+COPY --from=builder /app/op-chain-ops/bin/celo-migrate /app
 ENV PATH="/app:${PATH}"
 
 ENTRYPOINT ["/app/celo-migrate-blocks"]
diff --git a/op-chain-ops/Makefile b/op-chain-ops/Makefile
@@ -15,12 +15,6 @@ receipt-reference-builder:
 op-upgrade:
 	go build -o ./bin/op-upgrade ./cmd/op-upgrade/main.go
 
-celo-migrate-blocks:
-	go build -o ./bin/celo-migrate-blocks ./cmd/celo-migrate-blocks/*.go
-
-celo-migrate-state:
-	go build -o ./bin/celo-migrate-state ./cmd/celo-migrate-state/*.go
-
 celo-migrate:
 	go build -o ./bin/celo-migrate ./cmd/celo-migrate/*.go