Skip to content

Commit 2ab4d4f

Browse files
committed
executor: remove containerd
We no longer use containerd or ctr in any of the isolation options. Remove the vendored binaries as well as the debian package installation in the executor container image.
1 parent c77c89f commit 2ab4d4f

File tree

4 files changed

+0
-55
lines changed

4 files changed

+0
-55
lines changed

deps.bzl

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -418,32 +418,6 @@ def install_static_dependencies(workspace_name = "buildbuddy"):
418418
urls = ["https://github.com/rootless-containers/rootlesskit/releases/download/v2.3.5/rootlesskit-aarch64.tar.gz"],
419419
sha256 = "478c14c3195bf989cd9a8e6bd129d227d5d88f1c11418967ffdc84a0072cc7a2",
420420
)
421-
422-
http_archive(
423-
name = "com_github_containerd_containerd-linux-amd64",
424-
strip_prefix = "bin",
425-
build_file_content = "\n".join([
426-
'package(default_visibility = ["//visibility:public"])',
427-
'filegroup(name = "containerd.bin", srcs = ["containerd"])',
428-
'filegroup(name = "containerd-shim-runc-v2.bin", srcs = ["containerd-shim-runc-v2"])',
429-
'filegroup(name = "ctr.bin", srcs = ["ctr"])',
430-
]),
431-
urls = ["https://github.com/containerd/containerd/releases/download/v2.1.1/containerd-2.1.1-linux-amd64.tar.gz"],
432-
sha256 = "918e88fd393c28c89424e6535df0546ca36c1dfa7d8a5d685dee70b449380a9b",
433-
)
434-
http_archive(
435-
name = "com_github_containerd_containerd-linux-arm64",
436-
strip_prefix = "bin",
437-
build_file_content = "\n".join([
438-
'package(default_visibility = ["//visibility:public"])',
439-
'filegroup(name = "containerd.bin", srcs = ["containerd"])',
440-
'filegroup(name = "containerd-shim-runc-v2.bin", srcs = ["containerd-shim-runc-v2"])',
441-
'filegroup(name = "ctr.bin", srcs = ["ctr"])',
442-
]),
443-
urls = ["https://github.com/containerd/containerd/releases/download/v2.1.1/containerd-2.1.1-linux-arm64.tar.gz"],
444-
sha256 = "4e3c8c0c2e61438bb393a9ea6bb94f8f56b559ec3243d7b1a2943117bca4dcb4",
445-
)
446-
447421
http_archive(
448422
name = "cloudprober",
449423
build_file_content = "exports_files([\"cloudprober\"])",

deps/static_deps.MODULE.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ use_repo(
99
"com_github_buildbuddy_io_podman_static_podman-linux-amd64",
1010
"com_github_buildbuddy_io_podman_static_podman-linux-arm64",
1111
"com_github_buildbuddy_io_protoc_gen_protobufjs",
12-
"com_github_containerd_containerd-linux-amd64",
13-
"com_github_containerd_containerd-linux-arm64",
1412
"com_github_containers_crun_crun-linux-amd64",
1513
"com_github_containers_crun_crun-linux-arm64",
1614
"com_github_firecracker_microvm_firecracker",

dockerfiles/executor_image/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ RUN \
2626
rm -rf /var/lib/apt/lists/* && apt-get clean
2727

2828
RUN DOCKER_VERSION="5:28.2.2-1~debian.12~bookworm" && \
29-
CONTAINERD_DEB_VERSION="1.7.27-1" && \
3029
DOCKER_BUILDX_VERSION="0.24.0-1~debian.12~bookworm" && \
3130
DOCKER_COMPOSE_VERSION="2.36.2-1~debian.12~bookworm" && \
3231
apt-get update && \
@@ -43,7 +42,6 @@ RUN DOCKER_VERSION="5:28.2.2-1~debian.12~bookworm" && \
4342
docker-ce=${DOCKER_VERSION} \
4443
docker-ce-cli=${DOCKER_VERSION} \
4544
docker-ce-rootless-extras=${DOCKER_VERSION} \
46-
containerd.io=${CONTAINERD_DEB_VERSION} \
4745
docker-buildx-plugin=${DOCKER_BUILDX_VERSION} \
4846
docker-compose-plugin=${DOCKER_COMPOSE_VERSION} && \
4947
apt-mark auto \
@@ -54,11 +52,6 @@ RUN DOCKER_VERSION="5:28.2.2-1~debian.12~bookworm" && \
5452
# keep these in sync with the binaries we are manually
5553
# adding in enterprise/server/cmd/executor/BUILD.
5654
#
57-
# containerd
58-
/usr/bin/containerd \
59-
/usr/bin/containerd-shim \
60-
/usr/bin/containerd-shim-runc-v1 \
61-
/usr/bin/ctr \
6255
# rootlesskit
6356
/usr/bin/rootlesskit \
6457
# runc

enterprise/server/cmd/executor/BUILD

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -130,25 +130,6 @@ container_layer(
130130
tags = ["manual"],
131131
)
132132

133-
container_layer(
134-
name = "containerd_layer",
135-
directory = "/usr/bin",
136-
files = select({
137-
"@platforms//cpu:x86_64": [
138-
"@com_github_containerd_containerd-linux-amd64//:containerd.bin",
139-
"@com_github_containerd_containerd-linux-amd64//:containerd-shim-runc-v2.bin",
140-
"@com_github_containerd_containerd-linux-amd64//:ctr.bin",
141-
],
142-
"@platforms//cpu:arm64": [
143-
"@com_github_containerd_containerd-linux-arm64//:containerd.bin",
144-
"@com_github_containerd_containerd-linux-arm64//:containerd-shim-runc-v2.bin",
145-
"@com_github_containerd_containerd-linux-arm64//:ctr.bin",
146-
],
147-
"//conditions:default": [],
148-
}),
149-
tags = ["manual"],
150-
)
151-
152133
container_layer(
153134
name = "rootlesskit_layer",
154135
directory = "/usr/bin",
@@ -239,7 +220,6 @@ container_image(
239220
":tini_layer",
240221
":docker_credential_gcr_layer",
241222
":docker_credential_gcr_docker_config_layer",
242-
":containerd_layer",
243223
# Updating these layers does not currently afford us any vulnerability
244224
# fixes; leave them out for now.
245225
":runc_layer",

0 commit comments

Comments
 (0)