Docker: use container bundles to upload multiple image tags (#3003)

* use docker tag from environment, if exists * use container bundles to upload multiple image tags
2026-01-08 23:18:15 -05:00 · 2019-07-20 00:55:09 -04:00
parent dfc64121c6
commit cc696d90e3
13 changed files with 92 additions and 158 deletions
--- a/tools/bootnode/BUILD.bazel
+++ b/tools/bootnode/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle")

 go_library(
    name = "go_default_library",
@@ -48,19 +48,17 @@ go_image(
    ],
 )

-container_push(
-    name = "push_image",
-    format = "Docker",
-    image = ":image",
-    registry = "gcr.io",
-    repository = "prysmaticlabs/prysm/bootnode",
-    tag = "{DOCKER_TAG}",
-    tags = ["manual"],
-    visibility = ["//visibility:private"],
-)
-
 go_binary(
    name = "bootnode",
    embed = [":go_default_library"],
    visibility = ["//visibility:public"],
 )
+
+container_bundle(
+    name = "push_images",
+    images = {
+        "gcr.io/prysmaticlabs/prysm/bootnode:latest": ":image",
+        "gcr.io/prysmaticlabs/prysm/bootnode:{DOCKER_TAG}": ":image",
+    },
+    tags = ["manual"],
+)
--- a/tools/cluster-pk-manager/client/BUILD.bazel
+++ b/tools/cluster-pk-manager/client/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle")

 go_library(
    name = "go_default_library",
@@ -44,13 +44,11 @@ go_image(
    ],
 )

-container_push(
-    name = "push_image",
-    format = "Docker",
-    image = ":image",
-    registry = "gcr.io",
-    repository = "prysmaticlabs/prysm/cluster-pk-manager/client",
-    tag = "{DOCKER_TAG}",
+container_bundle(
+    name = "push_images",
+    images = {
+        "gcr.io/prysmaticlabs/prysm/cluster-pk-manager/client:latest": ":image",
+        "gcr.io/prysmaticlabs/prysm/cluster-pk-manager/client:{DOCKER_TAG}": ":image",
+    },
    tags = ["manual"],
-    visibility = ["//visibility:private"],
 )
--- a/tools/cluster-pk-manager/server/BUILD.bazel
+++ b/tools/cluster-pk-manager/server/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle")

 go_library(
    name = "go_default_library",
@@ -105,13 +105,11 @@ go_image(
    ],
 )

-container_push(
-    name = "push_image",
-    format = "Docker",
-    image = ":image",
-    registry = "gcr.io",
-    repository = "prysmaticlabs/prysm/cluster-pk-manager/server",
-    tag = "{DOCKER_TAG}",
+container_bundle(
+    name = "push_images",
+    images = {
+        "gcr.io/prysmaticlabs/prysm/cluster-pk-manager/server:latest": ":image",
+        "gcr.io/prysmaticlabs/prysm/cluster-pk-manager/server:{DOCKER_TAG}": ":image",
+    },
    tags = ["manual"],
-    visibility = ["//visibility:private"],
 )
--- a/tools/contract-addr/BUILD.bazel
+++ b/tools/contract-addr/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle")

 go_library(
    name = "go_default_library",
@@ -30,13 +30,11 @@ go_image(
    deps = ["@org_uber_go_automaxprocs//:go_default_library"],
 )

-container_push(
-    name = "push_image",
-    format = "Docker",
-    image = ":image",
-    registry = "gcr.io",
-    repository = "prysmaticlabs/prysm/contract-addr",
-    tag = "{DOCKER_TAG}",
+container_bundle(
+    name = "push_images",
+    images = {
+        "gcr.io/prysmaticlabs/prysm/contract-addr:latest": ":image",
+        "gcr.io/prysmaticlabs/prysm/contract-addr:{DOCKER_TAG}": ":image",
+    },
    tags = ["manual"],
-    visibility = ["//visibility:private"],
 )
--- a/tools/eth1exporter/BUILD.bazel
+++ b/tools/eth1exporter/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle")

 go_library(
    name = "go_default_library",
@@ -39,13 +39,11 @@ go_image(
    ],
 )

-container_push(
-    name = "push_image",
-    format = "Docker",
-    image = ":image",
-    registry = "gcr.io",
-    repository = "prysmaticlabs/eth1monitor",
-    tag = "{DOCKER_TAG}",
+container_bundle(
+    name = "push_images",
+    images = {
+        "gcr.io/prysmaticlabs/prysm/eth1monitor:latest": ":image",
+        "gcr.io/prysmaticlabs/prysm/eth1monitor:{DOCKER_TAG}": ":image",
+    },
    tags = ["manual"],
-    visibility = ["//visibility:private"],
 )
--- a/tools/faucet/BUILD.bazel
+++ b/tools/faucet/BUILD.bazel
@@ -2,7 +2,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle")

 IMPORT_PATH = "github.com/prysmaticlabs/prysm/tools/faucet"

@@ -53,13 +53,11 @@ go_image(
    deps = DEPS,
 )

-container_push(
-    name = "push_image",
-    format = "Docker",
-    image = ":image",
-    registry = "gcr.io",
-    repository = "prysmaticlabs/prysm/faucet",
-    tag = "{DOCKER_TAG}",
+container_bundle(
+    name = "push_images",
+    images = {
+        "gcr.io/prysmaticlabs/prysm/faucet:latest": ":image",
+        "gcr.io/prysmaticlabs/prysm/faucet:{DOCKER_TAG}": ":image",
+    },
    tags = ["manual"],
-    visibility = ["//visibility:private"],
 )
--- a/tools/relaynode/BUILD.bazel
+++ b/tools/relaynode/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle")

 go_library(
    name = "go_default_library",
@@ -40,19 +40,17 @@ go_image(
    ],
 )

-container_push(
-    name = "push_image",
-    format = "Docker",
-    image = ":image",
-    registry = "gcr.io",
-    repository = "prysmaticlabs/prysm/relaynode",
-    tag = "{DOCKER_TAG}",
-    tags = ["manual"],
-    visibility = ["//visibility:private"],
-)
-
 go_binary(
    name = "relaynode",
    embed = [":go_default_library"],
    visibility = ["//visibility:public"],
 )
+
+container_bundle(
+    name = "push_images",
+    images = {
+        "gcr.io/prysmaticlabs/prysm/relaynode:latest": ":image",
+        "gcr.io/prysmaticlabs/prysm/relaynode:{DOCKER_TAG}": ":image",
+    },
+    tags = ["manual"],
+)
--- a/tools/ssz-server/BUILD.bazel
+++ b/tools/ssz-server/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 load("@io_bazel_rules_docker//go:image.bzl", "go_image")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_bundle")

 go_library(
    name = "go_default_library",
@@ -38,13 +38,11 @@ go_image(
    ],
 )

-container_push(
-    name = "push_image",
-    format = "Docker",
-    image = ":image",
-    registry = "gcr.io",
-    repository = "prysmaticlabs/prysm/ssz-server",
-    tag = "{DOCKER_TAG}",
+container_bundle(
+    name = "push_images",
+    images = {
+        "gcr.io/prysmaticlabs/prysm/ssz-server:latest": ":image",
+        "gcr.io/prysmaticlabs/prysm/ssz-server:{DOCKER_TAG}": ":image",
+    },
    tags = ["manual"],
-    visibility = ["//visibility:private"],
 )