[libcxx-commits] [libcxx] 0262c11 - [libcxx][docker] Update android libc++ builders (#232887)

[via libcxx-commits]

Author: Nick Desaulniers
Date: 2026-10-21T08:38:24-07:00
New Revision: 0262c111c66182312f60b5883b235bf48466ff13

URL: https://github.com/llvm/llvm-project/commit/0262c111c66182312f60b5883b235bf48466ff13
DIFF: https://github.com/llvm/llvm-project/commit/0262c111c66182312f60b5883b235bf48466ff13.diff

LOG: [libcxx][docker] Update android libc++ builders (#232887)

The base images were consolidated in #225214. Move to the new base
image.

Ensure we run as root, since the new base image runs as `gha`.

To test:

    $ sudo docker compose --file \
      libcxx/utils/ci/docker/docker-compose.yml build \
      libcxx-android-builder

Link: #223854

Added: 
    

Modified: 
    libcxx/utils/ci/docker/android-builder.dockerfile
    libcxx/utils/ci/docker/docker-compose.yml

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/docker/android-builder.dockerfile b/libcxx/utils/ci/docker/android-builder.dockerfile
index 9c5d5047dbb86f..88a1eec9bb2422 100644
--- a/libcxx/utils/ci/docker/android-builder.dockerfile
+++ b/libcxx/utils/ci/docker/android-builder.dockerfile
@@ -28,7 +28,9 @@
 #   BUILDKITE_AGENT_TOKEN=<token>
 
 ARG BASE_IMAGE_VERSION
-FROM ghcr.io/llvm/libcxx-linux-builder-base:${BASE_IMAGE_VERSION}
+FROM ghcr.io/llvm/libcxx-linux-builder:${BASE_IMAGE_VERSION}
+
+USER root
 
 ARG ANDROID_CLANG_VERSION
 ARG ANDROID_CLANG_PREBUILTS_COMMIT
@@ -77,6 +79,7 @@ EOF
 
 # Create the libcxx-builder user
 RUN sudo useradd --create-home libcxx-builder
+USER libcxx-builder
 WORKDIR /home/libcxx-builder
 
 # Install the Buildkite agent and dependencies. This must be done as non-root
@@ -94,6 +97,7 @@ EOF
 ENV PATH="${PATH}:/home/libcxx-builder/.buildkite-agent/bin"
 
 # Install Docker
+USER root
 RUN <<EOF
   set -e
   curl -fsSL https://get.docker.com -o /tmp/get-docker.sh

diff  --git a/libcxx/utils/ci/docker/docker-compose.yml b/libcxx/utils/ci/docker/docker-compose.yml
index dd6743b0a5d87a..3df2298e6bc4ef 100644
--- a/libcxx/utils/ci/docker/docker-compose.yml
+++ b/libcxx/utils/ci/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       context: ../../../.. # monorepo root
       dockerfile: libcxx/utils/ci/docker/android-builder.dockerfile
       args:
-        BASE_IMAGE_VERSION: 8ece73c9f8b54fea6a98e9e4c55f9a2e6ccc9b3c
+        BASE_IMAGE_VERSION: 5e1edea790610e7ef8c5e06b6e5185fe5dd1c830
         ANDROID_CLANG_VERSION: r584948b
         ANDROID_CLANG_PREBUILTS_COMMIT: 2b062008b0a7be59ad85f012cfeee60f052808f1
         ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f