fix CI 3
This commit is contained in:
@@ -14,12 +14,14 @@ services:
|
|||||||
# same LXC/AppArmor runc bug (opencontainers/runc#5007) as image builds and
|
# same LXC/AppArmor runc bug (opencontainers/runc#5007) as image builds and
|
||||||
# always fails here. integration_test.bb polls the server until it's ready.
|
# always fails here. integration_test.bb polls the server until it's ready.
|
||||||
|
|
||||||
|
# The suite is baked into the image (Dockerfile) rather than bind-mounted: bind mounts
|
||||||
|
# resolve on the Docker host, so they break when run from inside a CI job container.
|
||||||
integration-test:
|
integration-test:
|
||||||
image: babashka/babashka:latest
|
image: vibe-integration-test
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
security_opt:
|
security_opt:
|
||||||
- apparmor:unconfined
|
- apparmor:unconfined
|
||||||
volumes:
|
|
||||||
- ./integration_test.bb:/integration_test.bb:ro
|
|
||||||
depends_on:
|
depends_on:
|
||||||
vibe-app:
|
vibe-app:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
|
|||||||
@@ -52,12 +52,13 @@ trap 'exit 143' TERM
|
|||||||
|
|
||||||
# Build the app image with buildx directly instead of through compose: compose delegates
|
# Build the app image with buildx directly instead of through compose: compose delegates
|
||||||
# builds to bake, which fails on the CI runner with "failed to find target default". The
|
# builds to bake, which fails on the CI runner with "failed to find target default". The
|
||||||
# image name matches `image:` in docker-compose.yml, so `run` below finds it and never
|
# image names match `image:` in docker-compose.yml, so `run` below finds them and never
|
||||||
# builds. DEPS_ALIASES must match build.args in docker-compose.coverage.yml.
|
# builds. DEPS_ALIASES must match build.args in docker-compose.coverage.yml.
|
||||||
docker buildx build --load \
|
docker buildx build --load \
|
||||||
--build-arg "DEPS_ALIASES=run${COVERAGE:+:cov}" \
|
--build-arg "DEPS_ALIASES=run${COVERAGE:+:cov}" \
|
||||||
-t vibe-app-integration \
|
-t vibe-app-integration \
|
||||||
-f "$root/Dockerfile" "$root"
|
-f "$root/Dockerfile" "$root"
|
||||||
|
docker buildx build --load -t vibe-integration-test "$root/integration-test"
|
||||||
|
|
||||||
# `run` returns the test container's own exit code; `up --abort-on-container-exit` can leak
|
# `run` returns the test container's own exit code; `up --abort-on-container-exit` can leak
|
||||||
# the app's SIGTERM exit (143) during teardown instead.
|
# the app's SIGTERM exit (143) during teardown instead.
|
||||||
|
|||||||
Reference in New Issue
Block a user