Skip to content

Commit

Permalink
Implement DinD on internal CI (#4149)
Browse files Browse the repository at this point in the history
b/360901490
  • Loading branch information
oxve authored Sep 24, 2024
1 parent 5102563 commit 9988eab
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
28 changes: 28 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,19 @@ services:
CONFIG: ${CONFIG:-debug}
TARGET_CPU: ${TARGET_CPU:-arm64}

# Defined common build image for android-evergreen
build-android-evergreen:
<<: *build-common-definitions
build:
context: ./docker/linux
dockerfile: android/Dockerfile
args:
- FROM_IMAGE=cobalt-build-evergreen
image: cobalt-build-android-evergreen
depends_on: [ build-evergreen ]
environment:
<<: *shared-build-env

build-raspi:
<<: *build-common-definitions
build:
Expand Down Expand Up @@ -432,6 +445,21 @@ services:
CONFIG: ${CONFIG:-debug}
SB_API_VERSION: 12

linux-x64x11-evergreen:
<<: *build-common-definitions
build:
context: ./docker/linux
dockerfile: linux-x64x11/Dockerfile
args:
- FROM_IMAGE=cobalt-build-evergreen
image: cobalt-build-linux-x64x11-evergreen
depends_on: [ build-evergreen ]
environment:
<<: *shared-build-env
PLATFORM: linux-x64x11
CONFIG: ${CONFIG:-debug}
SB_API_VERSION: ${SB_API_VERSION}

# Example usage of unittest:
# 1. Build the containers for which you want to unittest
# docker-compose up --build --no-start linux-x64x11 unittest
Expand Down
1 change: 1 addition & 0 deletions docker/linux/android/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ RUN apt update -qqy \
&& apt install -qqy \
libxml2-dev \
default-jdk \
binutils-arm-linux-gnueabi \
g++-multilib \
&& /opt/clean-after-apt.sh

Expand Down

0 comments on commit 9988eab

Please sign in to comment.