Skip to content

Commit 974f4a5

Browse files
committed
fix tests for base images
1 parent 9b31e5e commit 974f4a5

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.github/workflows/release.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,14 @@ jobs:
152152
153153
- name: Test built image
154154
env:
155+
COMMANDBOX_VERSION: ${{ env.commandbox_version }}
156+
DOCKER_BUILDKIT: 1
157+
COMPOSE_DOCKER_CLI_BUILD: 1
158+
BUILD_IMAGE_DOCKERFILE: ${{ matrix.BUILD_IMAGE_DOCKERFILE }}
155159
BUILD_IMAGE_TAG: ${{ env.BUILD_IMAGE_TAG }}
156160
run: |
157-
chmod +x ${{ github.workspace }}/build/run.sh
158-
${{ github.workspace }}/build/run.sh
161+
docker compose -f docker-compose.test.yml up --build --exit-code-from sut
162+
docker compose -f docker-compose.secret-test.yml up --build --exit-code-from sut
159163
160164
- name: DockerHub Login
161165
if: github.event_name != 'pull_request'
@@ -377,11 +381,12 @@ jobs:
377381
uses: docker/build-push-action@v4
378382
with:
379383
context: ${{ github.workspace }}
380-
file: ${{ github.workspace }}/${{ matrix.dockerfile }}
384+
file: ${{ github.workspace }}/${{ matrix.BUILD_IMAGE_DOCKERFILE }}
381385
push: true
382386
pull: true
383387
build-args: |
384388
COMMANDBOX_VERSION=${{ env.commandbox_version }}
389+
BASE_IMAGE_ARG=${{ env.ACTUAL_BASE_IMAGE }}
385390
platforms: ${{ env.arch_platforms }}
386391
builder: buildx-multi-arch
387392
tags: ${{ env.IMAGE_TAG }}

0 commit comments

Comments
 (0)