diff --git a/buildkite/docker/debian10/Dockerfile b/buildkite/docker/debian10/Dockerfile index dfe76a9a11..cd45711a5d 100644 --- a/buildkite/docker/debian10/Dockerfile +++ b/buildkite/docker/debian10/Dockerfile @@ -72,15 +72,6 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c apt-get update -y && apt-get install google-cloud-sdk -y && \ rm -rf /var/lib/apt/lists/* -### Docker (for legacy rbe_autoconfig) -RUN apt-get -y update && \ - apt-get -y install apt-transport-https ca-certificates && \ - curl -sSL https://download.docker.com/linux/debian/gpg | apt-key add - && \ - add-apt-repository "deb [arch=$BUILDARCH] https://download.docker.com/linux/debian $(lsb_release -cs) stable" && \ - apt-get -y update && \ - apt-get -y install docker-ce && \ - rm -rf /var/lib/apt/lists/* - # Bazelisk RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \ curl -Lo /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/${LATEST_BAZELISK}/bazelisk-linux-${BUILDARCH} && \ diff --git a/buildkite/docker/debian11/Dockerfile b/buildkite/docker/debian11/Dockerfile index b39e0d3bbf..8c11b714ac 100644 --- a/buildkite/docker/debian11/Dockerfile +++ b/buildkite/docker/debian11/Dockerfile @@ -66,15 +66,6 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c apt-get update -y && apt-get install google-cloud-sdk -y && \ rm -rf /var/lib/apt/lists/* -### Docker (for legacy rbe_autoconfig) -RUN apt-get -y update && \ - apt-get -y install apt-transport-https ca-certificates && \ - curl -sSL https://download.docker.com/linux/debian/gpg | apt-key add - && \ - add-apt-repository "deb [arch=$BUILDARCH] https://download.docker.com/linux/debian $(lsb_release -cs) stable" && \ - apt-get -y update && \ - apt-get -y install docker-ce && \ - rm -rf /var/lib/apt/lists/* - # Bazelisk RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \ curl -Lo /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/${LATEST_BAZELISK}/bazelisk-linux-${BUILDARCH} && \ diff --git a/buildkite/docker/debian12/Dockerfile b/buildkite/docker/debian12/Dockerfile index 12a2aa6e52..50bb5675af 100644 --- a/buildkite/docker/debian12/Dockerfile +++ b/buildkite/docker/debian12/Dockerfile @@ -61,15 +61,6 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c apt-get update -y && apt-get install google-cloud-sdk -y && \ rm -rf /var/lib/apt/lists/* -### Docker (for legacy rbe_autoconfig) -RUN apt-get -y update && \ - apt-get -y install apt-transport-https ca-certificates && \ - curl -sSL https://download.docker.com/linux/debian/gpg | apt-key add - && \ - add-apt-repository "deb [arch=$TARGETARCH] https://download.docker.com/linux/debian $(lsb_release -cs) stable" && \ - apt-get -y update && \ - apt-get -y install docker-ce && \ - rm -rf /var/lib/apt/lists/* - # Bazelisk RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \ curl -Lo /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/${LATEST_BAZELISK}/bazelisk-linux-${TARGETARCH} && \ diff --git a/buildkite/docker/debian13/Dockerfile b/buildkite/docker/debian13/Dockerfile index 8f59d86c60..27c21ce86b 100644 --- a/buildkite/docker/debian13/Dockerfile +++ b/buildkite/docker/debian13/Dockerfile @@ -61,15 +61,6 @@ RUN mkdir -p /usr/share/keyrings && \ apt-get update -y && apt-get install google-cloud-sdk -y && \ rm -rf /var/lib/apt/lists/* -### Docker (for legacy rbe_autoconfig) -RUN apt-get -y update && \ - apt-get -y install apt-transport-https ca-certificates && \ - curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \ - echo "deb [arch=$TARGETARCH signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \ - apt-get -y update && \ - apt-get -y install docker-ce && \ - rm -rf /var/lib/apt/lists/* - # Bazelisk RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \ curl -Lo /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/${LATEST_BAZELISK}/bazelisk-linux-${TARGETARCH} && \ diff --git a/buildkite/docker/rockylinux8/Dockerfile b/buildkite/docker/rockylinux8/Dockerfile index 7e8d89be7c..7ab62a4db7 100644 --- a/buildkite/docker/rockylinux8/Dockerfile +++ b/buildkite/docker/rockylinux8/Dockerfile @@ -41,11 +41,6 @@ RUN dnf -y install 'dnf-command(config-manager)' && \ # Allow using sudo inside the container. RUN echo "ALL ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers -RUN dnf -y install dnf-utils && \ - dnf config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo && \ - dnf -y install docker-ce docker-ce-cli containerd.io && \ - dnf clean all - # Ensure that Bazel can use its beloved ISO-8859-1 locale. RUN localedef -i en_US -f ISO-8859-1 en_US.ISO-8859-1 diff --git a/buildkite/docker/ubuntu1604/Dockerfile b/buildkite/docker/ubuntu1604/Dockerfile index 403711f2b6..6c629f9134 100644 --- a/buildkite/docker/ubuntu1604/Dockerfile +++ b/buildkite/docker/ubuntu1604/Dockerfile @@ -85,15 +85,6 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c apt-get update -y && apt-get install google-cloud-sdk -y && \ rm -rf /var/lib/apt/lists/* -### Docker (for legacy rbe_autoconfig) -RUN apt-get -y update && \ - apt-get -y install apt-transport-https ca-certificates && \ - curl -sSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ - add-apt-repository "deb [arch=$BUILDARCH] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \ - apt-get -y update && \ - apt-get -y install docker-ce && \ - rm -rf /var/lib/apt/lists/* - # Bazelisk RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \ curl -Lo /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/${LATEST_BAZELISK}/bazelisk-linux-${BUILDARCH} && \ diff --git a/buildkite/docker/ubuntu1804/Dockerfile b/buildkite/docker/ubuntu1804/Dockerfile index 271227e365..72bfcfe448 100644 --- a/buildkite/docker/ubuntu1804/Dockerfile +++ b/buildkite/docker/ubuntu1804/Dockerfile @@ -67,15 +67,6 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c apt-get update -y && apt-get install google-cloud-sdk -y && \ rm -rf /var/lib/apt/lists/* -### Docker (for legacy rbe_autoconfig) -RUN apt-get -y update && \ - apt-get -y install apt-transport-https ca-certificates && \ - curl -sSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ - add-apt-repository "deb [arch=$BUILDARCH] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \ - apt-get -y update && \ - apt-get -y install docker-ce && \ - rm -rf /var/lib/apt/lists/* - # Bazelisk RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \ curl -Lo /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/${LATEST_BAZELISK}/bazelisk-linux-${BUILDARCH} && \ diff --git a/buildkite/docker/ubuntu2004/Dockerfile b/buildkite/docker/ubuntu2004/Dockerfile index d9dcef82df..3cb4037e1b 100644 --- a/buildkite/docker/ubuntu2004/Dockerfile +++ b/buildkite/docker/ubuntu2004/Dockerfile @@ -81,15 +81,6 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c apt-get update -y && apt-get install google-cloud-sdk=466.0.0-0 -y && \ rm -rf /var/lib/apt/lists/* -### Docker (for legacy rbe_autoconfig) -RUN apt-get -y update && \ - apt-get -y install apt-transport-https ca-certificates && \ - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ - add-apt-repository "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" && \ - apt-get -y update && \ - apt-get -y install docker-ce && \ - rm -rf /var/lib/apt/lists/* - # Bazelisk RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \ curl -Lo /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/${LATEST_BAZELISK}/bazelisk-linux-${TARGETARCH} && \ diff --git a/buildkite/docker/ubuntu2404/Dockerfile b/buildkite/docker/ubuntu2404/Dockerfile index 5d48c48d67..07bd1e403c 100644 --- a/buildkite/docker/ubuntu2404/Dockerfile +++ b/buildkite/docker/ubuntu2404/Dockerfile @@ -16,7 +16,6 @@ RUN apt-get -y update && \ clang-tools \ coreutils \ curl \ - docker.io \ dnsutils \ ed \ expect \ diff --git a/buildkite/setup-docker.sh b/buildkite/setup-docker.sh index 96af37b309..688386cf8d 100755 --- a/buildkite/setup-docker.sh +++ b/buildkite/setup-docker.sh @@ -102,34 +102,6 @@ EOF sed -i 's/^::1 .*/::1 localhost ip6-localhost ip6-loopback/' /etc/hosts } -### Install Docker. -{ - apt-get -y install apt-transport-https ca-certificates - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg - echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null - - apt-get -y update - apt-get -y install docker-ce docker-ce-cli containerd.io - - # Allow everyone access to the Docker socket. Usually this would be insane from a security point - # of view, but these are untrusted throw-away machines anyway, so the risk is acceptable. - mkdir /etc/systemd/system/docker.socket.d - cat > /etc/systemd/system/docker.socket.d/override.conf <<'EOF' -[Socket] -SocketMode=0666 -EOF - - # Disable the Docker service, as the startup script has to mount /var/lib/docker first. - systemctl disable docker - systemctl stop docker - - # Add buildkite-agent to the docker group to grant it permissions to the Docker socket - usermod -aG docker buildkite-agent -} - ## Add our minimum uptime enforcer. { cat > /etc/systemd/system/minimum-uptime.service <<'EOF'