mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 02:16:07 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
eric 2023-12-01 14:33:42 -05:00
parent 37f2f48c8f
commit 1a013b61dc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libcxx/utils/ci/Dockerfile
View File

@ -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

8
libcxx/utils/ci/docker-compose.yml
View File

@ -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