Skip to content

Commit

Permalink
Allow libc++ image tag to be specified via enviroment variables.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
EricWF committed Dec 1, 2023
1 parent 37f2f48 commit 1a013b6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions libcxx/utils/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions libcxx/utils/ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 1a013b6

Please sign in to comment.