From cda1797d4e1a0f9745bb319a2067701278f56995 Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Wed, 16 Aug 2023 22:01:09 +0800 Subject: [PATCH] Remove Alpine Images From Prysm (#12749) --- cmd/beacon-chain/BUILD.bazel | 29 +---------------------------- cmd/prysmctl/BUILD.bazel | 27 +-------------------------- cmd/validator/BUILD.bazel | 29 +---------------------------- 3 files changed, 3 insertions(+), 82 deletions(-) diff --git a/cmd/beacon-chain/BUILD.bazel b/cmd/beacon-chain/BUILD.bazel index f872bfec4..640a2bfae 100644 --- a/cmd/beacon-chain/BUILD.bazel +++ b/cmd/beacon-chain/BUILD.bazel @@ -2,7 +2,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") load("@io_bazel_rules_go//go:def.bzl", "go_binary") load("@io_bazel_rules_docker//go:image.bzl", "go_image") load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image") -load("//tools:go_image.bzl", "go_image_alpine", "go_image_debug") +load("//tools:go_image.bzl", "go_image_debug") load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") go_library( @@ -46,7 +46,6 @@ go_library( go_image( name = "image", base = select({ - "//tools:base_image_alpine": "//tools:alpine_cc_image", "//tools:base_image_cc": "//tools:cc_image", "//conditions:default": "//tools:cc_image", }), @@ -93,25 +92,6 @@ container_bundle( visibility = ["//beacon-chain:__pkg__"], ) -go_image_alpine( - name = "image_alpine", - image = ":image", - tags = ["manual"], - visibility = ["//beacon-chain:__pkg__"], -) - -container_bundle( - name = "image_bundle_alpine", - images = { - "gcr.io/prysmaticlabs/prysm/beacon-chain:latest-alpine": ":image_alpine", - "gcr.io/prysmaticlabs/prysm/beacon-chain:{DOCKER_TAG}-alpine": ":image_alpine", - "index.docker.io/prysmaticlabs/prysm-beacon-chain:latest-alpine": ":image_alpine", - "index.docker.io/prysmaticlabs/prysm-beacon-chain:{DOCKER_TAG}-alpine": ":image_alpine", - }, - tags = ["manual"], - visibility = ["//beacon-chain:__pkg__"], -) - docker_push( name = "push_images", bundle = ":image_bundle", @@ -126,13 +106,6 @@ docker_push( visibility = ["//beacon-chain:__pkg__"], ) -docker_push( - name = "push_images_alpine", - bundle = ":image_bundle_alpine", - tags = ["manual"], - visibility = ["//beacon-chain:__pkg__"], -) - go_binary( name = "beacon-chain", embed = [":go_default_library"], diff --git a/cmd/prysmctl/BUILD.bazel b/cmd/prysmctl/BUILD.bazel index 9d3582102..c8c839ea3 100644 --- a/cmd/prysmctl/BUILD.bazel +++ b/cmd/prysmctl/BUILD.bazel @@ -2,7 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary") load("@prysm//tools/go:def.bzl", "go_library") load("@io_bazel_rules_docker//go:image.bzl", "go_image") load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image") -load("//tools:go_image.bzl", "go_image_alpine", "go_image_debug") +load("//tools:go_image.bzl", "go_image_debug") load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") go_library( @@ -26,7 +26,6 @@ go_library( go_image( name = "image", base = select({ - "//tools:base_image_alpine": "//tools:alpine_cc_image", "//tools:base_image_cc": "//tools:cc_image", "//conditions:default": "//tools:cc_image", }), @@ -69,23 +68,6 @@ container_bundle( visibility = ["//cmd/prysmctl:__pkg__"], ) -go_image_alpine( - name = "image_alpine", - image = ":image", - tags = ["manual"], - visibility = ["//cmd/prysmctl:__pkg__"], -) - -container_bundle( - name = "image_bundle_alpine", - images = { - "gcr.io/prysmaticlabs/prysm/cmd/prysmctl:latest-alpine": ":image_alpine", - "gcr.io/prysmaticlabs/prysm/cmd/prysmctl:{DOCKER_TAG}-alpine": ":image_alpine", - }, - tags = ["manual"], - visibility = ["//cmd/prysmctl:__pkg__"], -) - docker_push( name = "push_images", bundle = ":image_bundle", @@ -100,13 +82,6 @@ docker_push( visibility = ["//cmd/prysmctl:__pkg__"], ) -docker_push( - name = "push_images_alpine", - bundle = ":image_bundle_alpine", - tags = ["manual"], - visibility = ["//cmd/prysmctl:__pkg__"], -) - go_binary( name = "prysmctl", embed = [":go_default_library"], diff --git a/cmd/validator/BUILD.bazel b/cmd/validator/BUILD.bazel index a76cfbb8b..4643c5cbd 100644 --- a/cmd/validator/BUILD.bazel +++ b/cmd/validator/BUILD.bazel @@ -2,7 +2,7 @@ load("@prysm//tools/go:def.bzl", "go_library", "go_test") load("@io_bazel_rules_go//go:def.bzl", "go_binary") load("@io_bazel_rules_docker//go:image.bzl", "go_image") load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image") -load("//tools:go_image.bzl", "go_image_alpine", "go_image_debug") +load("//tools:go_image.bzl", "go_image_debug") load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") go_library( @@ -41,7 +41,6 @@ go_library( go_image( name = "image", base = select({ - "//tools:base_image_alpine": "//tools:alpine_cc_image", "//tools:base_image_cc": "//tools:cc_image", "//conditions:default": "//tools:cc_image", }), @@ -88,25 +87,6 @@ container_bundle( visibility = ["//validator:__pkg__"], ) -go_image_alpine( - name = "image_alpine", - image = ":image", - tags = ["manual"], - visibility = ["//validator:__pkg__"], -) - -container_bundle( - name = "image_bundle_alpine", - images = { - "gcr.io/prysmaticlabs/prysm/validator:latest-alpine": ":image_alpine", - "gcr.io/prysmaticlabs/prysm/validator:{DOCKER_TAG}-alpine": ":image_alpine", - "index.docker.io/prysmaticlabs/prysm-validator:latest-alpine": ":image_alpine", - "index.docker.io/prysmaticlabs/prysm-validator:{DOCKER_TAG}-alpine": ":image_alpine", - }, - tags = ["manual"], - visibility = ["//validator:__pkg__"], -) - docker_push( name = "push_images", bundle = ":image_bundle", @@ -121,13 +101,6 @@ docker_push( visibility = ["//validator:__pkg__"], ) -docker_push( - name = "push_images_alpine", - bundle = ":image_bundle_alpine", - tags = ["manual"], - visibility = ["//validator:__pkg__"], -) - go_binary( name = "validator", embed = [":go_default_library"],