diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index f05dd3d..ccd004f 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -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} diff --git a/README.md b/README.md index 1b3b4dd..7ff3b0c 100644 --- a/README.md +++ b/README.md @@ -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/ diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index bb9d95c..bfbf007 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -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: diff --git a/tests/nginx/nginx.conf b/tests/nginx/nginx.conf index 4e66550..70242ed 100644 --- a/tests/nginx/nginx.conf +++ b/tests/nginx/nginx.conf @@ -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; } } \ No newline at end of file