[libcxx] Do not use libcxx-builder-base image for Android image

[boomanaiden154]

The Android image did not use this prior to
bf07226 and this will significantly increase the size of the container image for dependencies we do not need.

[llvmbot]

@llvm/pr-subscribers-libcxx

Author: Aiden Grossman (boomanaiden154)

Changes

The Android image did not use this prior to
bf07226 and this will significantly increase the size of the container image for dependencies we do not need.

---

Full diff: https://github.com/llvm/llvm-project/pull/168756.diff

1 Files Affected:

• (modified) libcxx/utils/ci/docker/android-builder.dockerfile (+1-2)

diff --git a/libcxx/utils/ci/docker/android-builder.dockerfile b/libcxx/utils/ci/docker/android-builder.dockerfile
index 9c5d5047dbb86..e0eef49a8987d 100644
--- a/libcxx/utils/ci/docker/android-builder.dockerfile
+++ b/libcxx/utils/ci/docker/android-builder.dockerfile
@@ -27,8 +27,7 @@
 #
 #   BUILDKITE_AGENT_TOKEN=<token>
 
-ARG BASE_IMAGE_VERSION
-FROM ghcr.io/llvm/libcxx-linux-builder-base:${BASE_IMAGE_VERSION}
+FROM docker.io/library/ubuntu:jammy AS android-builder-base
 
 ARG ANDROID_CLANG_VERSION
 ARG ANDROID_CLANG_PREBUILTS_COMMIT

[ldionne]

For some reason I thought we needed it, but examination seems to confirm what you say.

This seems fine to me. However, in that case, do we even need a base image at all? Can we fold the base image into the normal linux image to simplify things further?

[boomanaiden154]

This seems fine to me. However, in that case, do we even need a base image at all? Can we fold the base image into the normal linux image to simplify things further?

We use the base image currently to contain everything but the Github runner binary so that we can push the base image and the github runner image separately. This allows pulling in an old base image and updating the Github runner.

We can fold them once we have enabled setting the container in the Github workflow working (still on the backlog).

[ldionne]

LGTM but the Docker image build was failing when I checked. Also, were you able to test this (i.e. run a build within this image)?

[boomanaiden154]

LGTM but the Docker image build was failing when I checked. Also, were you able to test this (i.e. run a build within this image)?

Yeah. Looks like we're missing a couple system dependencies that were coming in from the base image after the refactoring. I'll reintroduce that step.

I haven't tested it yet, but can make sure I do so before landing.

[boomanaiden154]

Looks like we were using this before bf07226, so this is not a regression. I'm going to close this for now.