[libcxx-commits] [libcxx] 1a013b6 - Allow libc++ image tag to be specified via enviroment variables.

[via libcxx-commits]

Author: eric
Date: 2023-12-01T14:34:36-05:00
New Revision: 1a013b61dc0f8f415fe34ce4339e35c13ad15785

URL: https://github.com/llvm/llvm-project/commit/1a013b61dc0f8f415fe34ce4339e35c13ad15785
DIFF: https://github.com/llvm/llvm-project/commit/1a013b61dc0f8f415fe34ce4339e35c13ad15785.diff

LOG: Allow libc++ image tag to be specified via enviroment variables.

This change is needed for changes I'm working on that allow
github workflows to build, push, and otherwise manage the container
images they use

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile
    libcxx/utils/ci/docker-compose.yml

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index 5510e4d6201b1f5..e4bda4f06742c1c 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -294,6 +294,10 @@ CMD /opt/android/container-setup.sh && buildkite-agent start
 #
 FROM builder-base AS actions-builder
 
+# Install 'act' for running github actions locally. This provides an alternative to the run-buildbot script
+# while still providing reproducability.
+RUN curl -s https://raw.githubusercontent.com/nektos/act/master/install.sh | sudo bash
+
 WORKDIR /home/runner
 USER runner
 

diff  --git a/libcxx/utils/ci/docker-compose.yml b/libcxx/utils/ci/docker-compose.yml
index 240e5b2828aa03c..26b341ced415503 100644
--- a/libcxx/utils/ci/docker-compose.yml
+++ b/libcxx/utils/ci/docker-compose.yml
@@ -6,7 +6,7 @@ x-versions: &compiler_versions
 
 services:
   buildkite-builder:
-    image: ghcr.io/libcxx/buildkite-builder:testing
+    image: ghcr.io/libcxx/buildkite-builder:${TAG:-latest}
     build:
       context: .
       dockerfile: Dockerfile
@@ -15,16 +15,16 @@ services:
         BASE_IMAGE: ubuntu:jammy
         <<: *compiler_versions
   actions-builder:
-    image: ghcr.io/libcxx/actions-builder:testing
+    image: ghcr.io/libcxx/actions-builder:${TAG:-latest}
     build:
       context: .
       dockerfile: Dockerfile
       target: actions-builder
       args:
-        BASE_IMAGE: ghcr.io/actions/actions-runner:latest
+        BASE_IMAGE: ghcr.io/actions/actions-runner:2.311.0
         <<: *compiler_versions
   android-buildkite-builder:
-    image: ghcr.io/libcxx/android-buildkite-builder:testing
+    image: ghcr.io/libcxx/android-buildkite-builder:${TAG:-latest}
     build:
       context: .
       dockerfile: Dockerfile