From dbf27fc7be08bdb821f13aef1bb29495bc6f6754 Mon Sep 17 00:00:00 2001 From: Jasper Jager Date: Mon, 20 Jan 2025 17:09:33 +0100 Subject: [PATCH] Use local schemas in openapi spec test Starting up the container with the full Amsterdam Schema takes to long, so we use the outdated/mangled schema for this test. --- .github/workflows/test-openapi-spec.yaml | 8 +++++--- docker-compose.yml | 11 +++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-openapi-spec.yaml b/.github/workflows/test-openapi-spec.yaml index e084049bb..698b90495 100644 --- a/.github/workflows/test-openapi-spec.yaml +++ b/.github/workflows/test-openapi-spec.yaml @@ -19,7 +19,10 @@ jobs: uses: actions/checkout@v1 - name: Start containers - run: docker compose -f "docker-compose.yml" up -d --build + run: docker compose -f "docker-compose.yml" --profile openapi_spec_test up -d --build + env: + SCHEMA_URL: "http://schemas/datasets/" + - name: Setup tests run: | @@ -27,8 +30,7 @@ jobs: # Create spectral config file echo 'extends: ["spectral:oas", "spectral:asyncapi"]' > ./spectral/.spectral.yaml # Give dso-api some time to start - sleep 120 - + sleep 10 docker compose logs web # Grab openapi yaml for bag dataset diff --git a/docker-compose.yml b/docker-compose.yml index 01d8035ab..0c2f04253 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,7 @@ services: - "8090:8000" links: - database + - schemas depends_on: database: condition: service_healthy @@ -72,3 +73,13 @@ services: - ALLOW_EMPTY_PASSWORD=yes ports: - '6379:6379' + + schemas: + image: nginx + profiles: [openapi_spec_test] + ports: + - "8080:80" + volumes: + - "./schemas/data/datasets:/usr/share/nginx/html/datasets" + - "./schemas/data/publishers:/usr/share/nginx/html/publishers" + - "./schemas/conf/default.conf:/etc/nginx/conf.d/default.conf"