[libc++][CI] Use fully qualified names in docker images (NFC) #162156
+4
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Baranov Victor (vbvictor) ChangesBased on #162007 (comment), we should avoid having short links in docker images. Full diff: https://github.com/llvm/llvm-project/pull/162156.diff 3 Files Affected:
diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index 8e1c341c10b92..d22deec4dadab 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -181,7 +181,7 @@ EOF
# Android Builder Base Image
# ===----------------------------------------------------------------------===##
-FROM ubuntu:jammy AS android-builder-base
+FROM docker.io/library/ubuntu:jammy AS android-builder-base
ARG ANDROID_CLANG_VERSION
ARG ANDROID_CLANG_PREBUILTS_COMMIT
diff --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml
index e89623d2a847d..cac97a945b2a8 100644
--- a/libcxx/utils/ci/docker-compose.yml
+++ b/libcxx/utils/ci/docker-compose.yml
@@ -3,7 +3,7 @@ x-versions: &compiler_versions
LLVM_HEAD_VERSION: 22
x-image-versions: &image_versions
- BASE_IMAGE: ubuntu:jammy
+ BASE_IMAGE: docker.io/library/ubuntu:jammy
ACTIONS_BASE_IMAGE: ghcr.io/llvm/libcxx-linux-builder-base:77cb0980bcc2675b27d08141526939423fa0be76
services:
@@ -33,7 +33,7 @@ services:
dockerfile: Dockerfile
target: android-buildkite-builder
args:
- BASE_IMAGE: ubuntu:noble
+ BASE_IMAGE: docker.io/library/ubuntu:noble
ANDROID_CLANG_VERSION: r563880
ANDROID_CLANG_PREBUILTS_COMMIT: 6ae4184bb8706f9731569b9a0a82be3fcdcb951c
ANDROID_SYSROOT_COMMIT: f8b85cc5262c6e5cbc9a92c1bab2b18b32a4c63f
diff --git a/libcxx/utils/ci/vendor/android/Dockerfile.emulator b/libcxx/utils/ci/vendor/android/Dockerfile.emulator
index 6ce9b82d258eb..bd864f6db1975 100644
--- a/libcxx/utils/ci/vendor/android/Dockerfile.emulator
+++ b/libcxx/utils/ci/vendor/android/Dockerfile.emulator
@@ -6,7 +6,7 @@
#
# ===----------------------------------------------------------------------===##
-FROM ubuntu:jammy
+FROM docker.io/library/ubuntu:jammy
RUN apt-get update && apt-get install -y \
curl \
|
vbvictor
changed the title
boomanaiden154
approved these changes
Oct 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Based on #162007 (comment), we should avoid having short links in docker images.