Skip to content

Commit 04ff24b

Browse files
committed
add base image arg to tests
1 parent 4ed178b commit 04ff24b

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ jobs:
157157
COMPOSE_DOCKER_CLI_BUILD: 1
158158
BUILD_IMAGE_DOCKERFILE: ${{ matrix.BUILD_IMAGE_DOCKERFILE }}
159159
BUILD_IMAGE_TAG: ${{ env.BUILD_IMAGE_TAG }}
160+
BASE_IMAGE_ARG:
160161
run: |
161162
docker compose -f docker-compose.test.yml up --build --exit-code-from sut
162163
docker compose -f docker-compose.secret-test.yml up --build --exit-code-from sut
@@ -365,6 +366,7 @@ jobs:
365366
COMPOSE_DOCKER_CLI_BUILD: 1
366367
BUILD_IMAGE_DOCKERFILE: ${{ matrix.BUILD_IMAGE_DOCKERFILE }}
367368
BUILD_IMAGE_TAG: ${{ env.BUILD_IMAGE_TAG }}
369+
BASE_IMAGE_ARG: ${{ env.ACTUAL_BASE_IMAGE }}
368370
run: |
369371
docker compose -f docker-compose.test.yml up --build --exit-code-from sut
370372
docker compose -f docker-compose.secret-test.yml up --build --exit-code-from sut

docker-compose.secret-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
dockerfile: "./${BUILD_IMAGE_DOCKERFILE}"
1313
args :
1414
- COMMANDBOX_VERSION
15+
- BASE_IMAGE_ARG
1516
container_name: secret-test
1617
environment:
1718
- SOME_VAR=foo

docker-compose.test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ services:
1313
dockerfile: "./${BUILD_IMAGE_DOCKERFILE}"
1414
args :
1515
- COMMANDBOX_VERSION
16+
- BASE_IMAGE_ARG
1617
command: /root/build/test.sh
1718
#Mount our test directory ( and our build directory to make local testing easier )
1819
volumes:

0 commit comments

Comments
 (0)