Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
maaikelimper committed Jan 18, 2024
1 parent 8488c6d commit c59fdf0
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
run: sleep 45
- name: Check status code
run: |
curl -s -o /dev/null -w "%{http_code}" http://localhost:4173/wis2box-webapp
status_code=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:4173/wis2box-webapp)
curl -s -o /dev/null -w "%{http_code}" http://localhost:4173/wis2box-webapp/
status_code=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:4173/wis2box-webapp/)
if [[ $status_code -ne 200 ]]; then
echo "Request failed with status code:"
echo ${status_code}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Run the following command to build the image:
To test the webapp as part of the wis2box stack, run the following commands:

```bash
docker-compose -f tests/docker-compose.yml up -d
docker-compose -f tests/docker-compose.yml up -d --build
```

This will start the webapp which will be available at http://localhost:4173/wis2box-webapp/
Expand Down
9 changes: 9 additions & 0 deletions tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ services:
ports:
- "5883:1883"

wis2box-auth:
container_name: wis2box-api-test-wis2box-auth
restart: always
image: ghcr.io/wmo-im/wis2box-auth:latest
env_file:
- test.env
volumes:
- /tmp:/data/wis2box:rw

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.6.2
environment:
Expand Down
4 changes: 2 additions & 2 deletions tests/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
set $x_api_http_method $request_method;
proxy_pass http://wis2box-api:80;
}
location /wis2box-webapp/ {
proxy_pass http://wis2box-webapp:4173/wis2box-webapp/;
location /wis2box-webapp {
proxy_pass http://wis2box-webapp:4173/wis2box-webapp;
}
}

0 comments on commit c59fdf0

Please sign in to comment.