Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker, CI: Make JS integration tests more robust; update screenshots #1021

Merged
merged 5 commits into from
Apr 29, 2024
Merged

Docker, CI: Make JS integration tests more robust; update screenshots #1021

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6ba8fb
docker/testbed: Use static base image Debian Bookworm w/ Node22
ix5 Apr 28, 2024
dc30552
tests: Update screenshots and hashes
ix5 Apr 28, 2024
9a37f0c
.github: Add period rebuild for docker-js-testbed
ix5 Apr 28, 2024
cada56a
.github/e2e: Make health checks more robust
ix5 Apr 28, 2024
265d8e6
docker-compose: Fix health check and tune params
ix5 Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
docker-compose: Fix health check and tune params
  • Loading branch information
@ix5
ix5 committed Apr 29, 2024
commit 265d8e6aaa326ac1bdc024aec534eb2129328113
17 changes: 11 additions & 6 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,20 @@ services:
#command: /isso/bin/isso -c /config/isso.cfg run
environment:
ISSO_SETTINGS: "/config/isso-dev.cfg"
ISSO_ENDPOINT: "http://isso-dev.local:8080"
healthcheck:
test: wget --no-verbose --tries=1 --spider http://localhost:8080/info || exit 1
interval: 5s # short timeout needed during start phase
retries: 3
start_period: 5s
timeout: 3s
# Double $$ for parsing vars inside CMD: https://stackoverflow.com/a/54989793
# Debug with 'docker inspect --format "{{json .State.Health }}" isso-server | jq'
test: wget --no-verbose --tries=1 --spider $$ISSO_ENDPOINT/info || exit 1
interval: 1s # time before first check and between subsequent checks
retries: 10
start_period: 10s
timeout: 10s
# If needed, production docker image can also be exposed to host for
# non-docker unit/integration testing
ports:
- 127.0.0.1:8080:8080
# Expose port 80080 to other containerized services, not to host machine:
# Expose port 8080 to other containerized services, not to host machine:
expose:
- 8080
networks:
Expand All @@ -49,6 +52,8 @@ services:
dockerfile: docker/Dockerfile-js-testbed
environment:
ISSO_ENDPOINT: "http://isso-dev.local:8080"
healthcheck:
disable: true
# Command may also run from outside docker compose, e.g.:
# $ docker run isso-js-testbed [mount, networks, ...] npm run test-integration
#command: npm run test-integration
Expand Down
Loading