From bb61bbba20d7b8fd44f3abb0bf3d0af0fcce79a3 Mon Sep 17 00:00:00 2001 From: Zack Winter <3457246+zackwintermdb@users.noreply.github.com> Date: Mon, 12 Aug 2024 17:07:12 -0700 Subject: [PATCH] SERVER-93253 Port gssapi_helpers from SCons to Bazel (#25988) GitOrigin-RevId: fa049fff2628bdfa8c03c364f2806a7784d93277 --- .../platforms/remote_execution_containers.bzl | 24 +++++++++---------- .../debian10/dockerfile | 1 + .../debian12/dockerfile | 1 + .../repin_dockerfiles.sh | 1 + .../ubuntu18/dockerfile | 1 + .../ubuntu20/dockerfile | 1 + .../ubuntu22/dockerfile | 1 + .../ubuntu24/dockerfile | 1 + 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/bazel/platforms/remote_execution_containers.bzl b/bazel/platforms/remote_execution_containers.bzl index 3ba61746fcd..c4d27083f7e 100644 --- a/bazel/platforms/remote_execution_containers.bzl +++ b/bazel/platforms/remote_execution_containers.bzl @@ -12,14 +12,14 @@ REMOTE_EXECUTION_CONTAINERS = { "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:06fc8103d2e2af9878ee7c5a792f32b3de1c8d68266c193f7ab35b7a136da519", }, "debian10": { - "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:f147b396a33ea443b6d15e1ad41ebddadb8dd2f4fcec7376036f8aba649f1676", + "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:4917278b646f5cd298013cad8a6bf645a258d14a22b93b5389975d2db80baff4", "dockerfile": "bazel/remote_execution_container/debian10/Dockerfile", - "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:f147b396a33ea443b6d15e1ad41ebddadb8dd2f4fcec7376036f8aba649f1676", + "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:4917278b646f5cd298013cad8a6bf645a258d14a22b93b5389975d2db80baff4", }, "debian12": { - "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:27f95376c57306129c36a689f45d19a6932e4b91f86ac3e317e8202fbfc55e1c", + "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:d1df0fd76f9fdf28813fbe25dc9b989b5228f94cd37eae11fb194f67d3afdbbb", "dockerfile": "bazel/remote_execution_container/debian12/Dockerfile", - "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:27f95376c57306129c36a689f45d19a6932e4b91f86ac3e317e8202fbfc55e1c", + "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:d1df0fd76f9fdf28813fbe25dc9b989b5228f94cd37eae11fb194f67d3afdbbb", }, "linux": { "_COMMENT": "Uses amazon linux 2 container", @@ -43,23 +43,23 @@ REMOTE_EXECUTION_CONTAINERS = { "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:5295903271760e7e555590fb8858c1f7a74d3c0dd109d8ca200130ce07343ea4", }, "ubuntu18": { - "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:eb517902338241f66666619a885786ca92b87501d95ae22cf372b8d60c01bd4d", + "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:fad0b715ba85885f23eb43292014529bd4b9946e1ca1b825c2d8c9443f95a3e1", "dockerfile": "bazel/remote_execution_container/ubuntu18/Dockerfile", - "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:eb517902338241f66666619a885786ca92b87501d95ae22cf372b8d60c01bd4d", + "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:fad0b715ba85885f23eb43292014529bd4b9946e1ca1b825c2d8c9443f95a3e1", }, "ubuntu20": { - "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:0c7f442b0013fbb93f49867164d1d37bc7d77ba0c832e88c8731904e0cc5ec43", + "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:ed2d5bd04f0f23dbb57ff4e0f6d73f732e87b5ec976f7283908003a45b98a82e", "dockerfile": "bazel/remote_execution_container/ubuntu20/Dockerfile", - "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:0c7f442b0013fbb93f49867164d1d37bc7d77ba0c832e88c8731904e0cc5ec43", + "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:ed2d5bd04f0f23dbb57ff4e0f6d73f732e87b5ec976f7283908003a45b98a82e", }, "ubuntu22": { - "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:47b9cc1b0e178e4d3a9c2f4d995d4623ba9bc59a1f207127a0e8b15d0c26a99b", + "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:c1e4291aa0a1054e5c119a6c6a2ac3b43b2903e2f2c68d30148da7b57691ee9d", "dockerfile": "bazel/remote_execution_container/ubuntu22/Dockerfile", - "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:47b9cc1b0e178e4d3a9c2f4d995d4623ba9bc59a1f207127a0e8b15d0c26a99b", + "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:c1e4291aa0a1054e5c119a6c6a2ac3b43b2903e2f2c68d30148da7b57691ee9d", }, "ubuntu24": { - "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:83c63a552747517a6405f91c38e634b7391d9458f1b81e5f92846ed589527295", + "container-url": "docker://quay.io/mongodb/bazel-remote-execution@sha256:8028f63bd4514e47871c7506aee6280e9f83db1d74e90a525ec61d30375f85bb", "dockerfile": "bazel/remote_execution_container/ubuntu24/Dockerfile", - "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:83c63a552747517a6405f91c38e634b7391d9458f1b81e5f92846ed589527295", + "web-url": "https://quay.io/repository/mongodb/bazel-remote-execution/manifest/sha256:8028f63bd4514e47871c7506aee6280e9f83db1d74e90a525ec61d30375f85bb", }, } diff --git a/bazel/remote_execution_container/debian10/dockerfile b/bazel/remote_execution_container/debian10/dockerfile index 41c8ded55ac..05eefb35444 100644 --- a/bazel/remote_execution_container/debian10/dockerfile +++ b/bazel/remote_execution_container/debian10/dockerfile @@ -17,6 +17,7 @@ RUN apt-get update && \ libcurl4-openssl-dev=7.64.0-4+deb10u9 \ libfl2=2.6.4-6.2 \ libgssapi-krb5-2=1.17-3+deb10u6 \ + libkrb5-dev=1.17-3+deb10u6 \ libldap2-dev=2.4.47+dfsg-3+deb10u7 \ libsasl2-dev=2.1.27+dfsg-1+deb10u2 \ libssl-dev=1.1.1n-0+deb10u6 \ diff --git a/bazel/remote_execution_container/debian12/dockerfile b/bazel/remote_execution_container/debian12/dockerfile index f1392c43f30..20187a8b0cf 100644 --- a/bazel/remote_execution_container/debian12/dockerfile +++ b/bazel/remote_execution_container/debian12/dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && \ build-essential=12.9 \ libcurl4-openssl-dev=7.88.1-10+deb12u6 \ libgssapi-krb5-2=1.20.1-2+deb12u2 \ + libkrb5-dev=1.20.1-2+deb12u2 \ libldap2-dev=2.5.13+dfsg-5 \ libsasl2-dev=2.1.28+dfsg-10 \ libssl-dev=3.0.13-1~deb12u1 \ diff --git a/bazel/remote_execution_container/repin_dockerfiles.sh b/bazel/remote_execution_container/repin_dockerfiles.sh index f08cba30102..adbaedc38de 100755 --- a/bazel/remote_execution_container/repin_dockerfiles.sh +++ b/bazel/remote_execution_container/repin_dockerfiles.sh @@ -42,6 +42,7 @@ libldap2-dev libsasl2-dev libssl-dev libxml2-dev +libkrb5-dev " COMMON_PACKAGES["suse"]=" diff --git a/bazel/remote_execution_container/ubuntu18/dockerfile b/bazel/remote_execution_container/ubuntu18/dockerfile index c0d3fcb3ebc..c5af7fb7e2e 100644 --- a/bazel/remote_execution_container/ubuntu18/dockerfile +++ b/bazel/remote_execution_container/ubuntu18/dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && \ build-essential=12.4ubuntu1 \ libcurl4-openssl-dev=7.58.0-2ubuntu3.24 \ libgssapi-krb5-2=1.16-2ubuntu0.4 \ + libkrb5-dev=1.16-2ubuntu0.4 \ libldap2-dev=2.4.45+dfsg-1ubuntu1.11 \ libsasl2-dev=2.1.27~101-g0780600+dfsg-3ubuntu2.4 \ libssl-dev=1.1.1-1ubuntu2.1~18.04.23 \ diff --git a/bazel/remote_execution_container/ubuntu20/dockerfile b/bazel/remote_execution_container/ubuntu20/dockerfile index 39b7f0470bf..5a1344e5947 100644 --- a/bazel/remote_execution_container/ubuntu20/dockerfile +++ b/bazel/remote_execution_container/ubuntu20/dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && \ build-essential=12.8ubuntu1.1 \ libcurl4-openssl-dev=7.68.0-1ubuntu2.23 \ libgssapi-krb5-2=1.17-6ubuntu4.6 \ + libkrb5-dev=1.17-6ubuntu4.6 \ libldap2-dev=2.4.49+dfsg-2ubuntu1.10 \ libsasl2-dev=2.1.27+dfsg-2ubuntu0.1 \ libssl-dev=1.1.1f-1ubuntu2.23 \ diff --git a/bazel/remote_execution_container/ubuntu22/dockerfile b/bazel/remote_execution_container/ubuntu22/dockerfile index 00edd6a18f4..2e1e2c05ea7 100644 --- a/bazel/remote_execution_container/ubuntu22/dockerfile +++ b/bazel/remote_execution_container/ubuntu22/dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && \ build-essential=12.9ubuntu3 \ libcurl4-openssl-dev=7.81.0-1ubuntu1.17 \ libgssapi-krb5-2=1.19.2-2ubuntu0.4 \ + libkrb5-dev=1.19.2-2ubuntu0.4 \ libldap2-dev=2.5.18+dfsg-0ubuntu0.22.04.2 \ libsasl2-dev=2.1.27+dfsg2-3ubuntu1.2 \ libssl-dev=3.0.2-0ubuntu1.17 \ diff --git a/bazel/remote_execution_container/ubuntu24/dockerfile b/bazel/remote_execution_container/ubuntu24/dockerfile index e0f1e714550..2e6177037f6 100644 --- a/bazel/remote_execution_container/ubuntu24/dockerfile +++ b/bazel/remote_execution_container/ubuntu24/dockerfile @@ -16,6 +16,7 @@ RUN apt-get update && \ build-essential=12.10ubuntu1 \ libcurl4-openssl-dev=8.5.0-2ubuntu10.2 \ libgssapi-krb5-2=1.20.1-6ubuntu2.1 \ + libkrb5-dev=1.20.1-6ubuntu2.1 \ libldap2-dev=2.6.7+dfsg-1~exp1ubuntu8 \ libsasl2-dev=2.1.28+dfsg1-5ubuntu3 \ libssl-dev=3.0.13-0ubuntu3.2 \