ops: add op-program docker target

ethereum-optimism · Oct 25, 2023 · 8358328 · 8358328
1 parent c622719
commit 8358328
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1406,6 +1406,7 @@ workflows:
           name: op-stack-go-docker-build
           docker_name: op-stack-go
           docker_tags: <<pipeline.git.revision>>,<<pipeline.git.branch>>
+          save_image_tag: <<pipeline.git.revision>> # for devnet later
       - docker-build:
           name: op-node-docker-build
           docker_name: op-node

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 COMPOSEFLAGS=-d
 ITESTS_L2_HOST=http://localhost:9545
 BEDROCK_TAGS_REMOTE?=origin
-OP_STACK_GO_BUILDER?=us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:latest
+OP_STACK_GO_BUILDER?=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 
 build: build-go build-ts
 .PHONY: build

diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -38,17 +38,17 @@ target "op-stack-go" {
     GIT_DATE = "${GIT_DATE}"
   }
   platforms = split(",", PLATFORMS)
-  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op_stack_go:${tag}"]
+  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-stack-go:${tag}"]
 }
 
 target "op-node" {
   dockerfile = "Dockerfile"
   context = "./op-node"
   args = {
-    OP_STACK_GO_BUILDER = "op_stack_go"
+    OP_STACK_GO_BUILDER = "op-stack-go"
   }
   contexts = {
-    op_stack_go: "target:op-stack-go"
+    op-stack-go: "target:op-stack-go"
   }
   platforms = split(",", PLATFORMS)
   tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-node:${tag}"]
@@ -58,10 +58,10 @@ target "op-batcher" {
   dockerfile = "Dockerfile"
   context = "./op-batcher"
   args = {
-    OP_STACK_GO_BUILDER = "op_stack_go"
+    OP_STACK_GO_BUILDER = "op-stack-go"
   }
   contexts = {
-    op_stack_go: "target:op-stack-go"
+    op-stack-go: "target:op-stack-go"
   }
   platforms = split(",", PLATFORMS)
   tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-batcher:${tag}"]
@@ -71,10 +71,10 @@ target "op-proposer" {
   dockerfile = "Dockerfile"
   context = "./op-proposer"
   args = {
-    OP_STACK_GO_BUILDER = "op_stack_go"
+    OP_STACK_GO_BUILDER = "op-stack-go"
   }
   contexts = {
-    op_stack_go: "target:op-stack-go"
+    op-stack-go: "target:op-stack-go"
   }
   platforms = split(",", PLATFORMS)
   tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-proposer:${tag}"]
@@ -84,10 +84,10 @@ target "op-challenger" {
   dockerfile = "Dockerfile"
   context = "./op-challenger"
   args = {
-    OP_STACK_GO_BUILDER = "op_stack_go"
+    OP_STACK_GO_BUILDER = "op-stack-go"
   }
   contexts = {
-    op_stack_go: "target:op-stack-go"
+    op-stack-go: "target:op-stack-go"
   }
   platforms = split(",", PLATFORMS)
   tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-challenger:${tag}"]
@@ -97,15 +97,28 @@ target "op-heartbeat" {
   dockerfile = "Dockerfile"
   context = "./op-heartbeat"
   args = {
-    OP_STACK_GO_BUILDER = "op_stack_go"
+    OP_STACK_GO_BUILDER = "op-stack-go"
   }
   contexts = {
-    op_stack_go: "target:op-stack-go"
+    op-stack-go: "target:op-stack-go"
   }
   platforms = split(",", PLATFORMS)
   tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-heartbeat:${tag}"]
 }
 
+target "op-program" {
+  dockerfile = "Dockerfile"
+  context = "./op-program"
+  args = {
+    OP_STACK_GO_BUILDER = "op-stack-go"
+  }
+  contexts = {
+    op-stack-go: "target:op-stack-go"
+  }
+  platforms = split(",", PLATFORMS)
+  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-program:${tag}"]
+}
+
 target "proxyd" {
   dockerfile = "Dockerfile"
   context = "./proxyd"

diff --git a/op-batcher/Dockerfile b/op-batcher/Dockerfile
@@ -1,4 +1,4 @@
-ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:latest
+ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 FROM $OP_STACK_GO_BUILDER as builder
 # See "make golang-docker" and /ops/docker/op-stack-go
 

diff --git a/op-challenger/Dockerfile b/op-challenger/Dockerfile
@@ -1,4 +1,4 @@
-ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:latest
+ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 FROM $OP_STACK_GO_BUILDER as builder
 # See "make golang-docker" and /ops/docker/op-stack-go
 

diff --git a/op-heartbeat/Dockerfile b/op-heartbeat/Dockerfile
@@ -1,4 +1,4 @@
-ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:latest
+ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 FROM $OP_STACK_GO_BUILDER as builder
 # See "make golang-docker" and /ops/docker/op-stack-go
 

diff --git a/op-node/Dockerfile b/op-node/Dockerfile
@@ -1,4 +1,4 @@
-ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:latest
+ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 FROM $OP_STACK_GO_BUILDER as builder
 # See "make golang-docker" and /ops/docker/op-stack-go
 

diff --git a/op-program/Dockerfile b/op-program/Dockerfile
@@ -1,4 +1,4 @@
-ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:latest
+ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 FROM $OP_STACK_GO_BUILDER as builder
 # See "make golang-docker" and /ops/docker/op-stack-go
 

diff --git a/op-proposer/Dockerfile b/op-proposer/Dockerfile
@@ -1,4 +1,4 @@
-ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:latest
+ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 FROM $OP_STACK_GO_BUILDER as builder
 # See "make golang-docker" and /ops/docker/op-stack-go
 

diff --git a/op-wheel/Dockerfile b/op-wheel/Dockerfile
@@ -1,4 +1,4 @@
-ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:latest
+ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
 FROM $OP_STACK_GO_BUILDER as builder
 # See "make golang-docker" and /ops/docker/op-stack-go
 FROM alpine:3.18

diff --git a/ops-bedrock/docker-compose.yml b/ops-bedrock/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       args:
         GIT_COMMIT: "dev"
         GIT_DATE: "0"
-    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:devnet
+    image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:devnet
     entrypoint: ["echo", "build complete"]
 
   l1:
@@ -59,7 +59,7 @@ services:
       context: ../
       dockerfile: ./op-node/Dockerfile
       args:
-        OP_STACK_GO_BUILDER: us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:devnet
+        OP_STACK_GO_BUILDER: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:devnet
     image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node:devnet
     command: >
       op-node
@@ -107,7 +107,7 @@ services:
       context: ../
       dockerfile: ./op-proposer/Dockerfile
       args:
-        OP_STACK_GO_BUILDER: us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:devnet
+        OP_STACK_GO_BUILDER: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:devnet
     image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-proposer:devnet
     ports:
       - "6062:6060"
@@ -136,7 +136,7 @@ services:
       context: ../
       dockerfile: ./op-batcher/Dockerfile
       args:
-        OP_STACK_GO_BUILDER: us-docker.pkg.dev/oplabs-tools-artifacts/images/op_stack_go:devnet
+        OP_STACK_GO_BUILDER: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:devnet
     image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-batcher:devnet
     ports:
       - "6061:6060"