From 5681e289f2d03e8b60f049e8f0b945f117f3974a Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Mon, 16 Dec 2024 13:38:27 -0800 Subject: [PATCH] fix(openchallenges): configure OC apex to run on port 8000 again (ARCH-371) (#2948) --- apps/openchallenges/apex/Caddyfile | 2 +- apps/openchallenges/apex/Dockerfile | 2 +- docker/openchallenges/services/apex.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/openchallenges/apex/Caddyfile b/apps/openchallenges/apex/Caddyfile index 666f4149dd..7d196d094e 100644 --- a/apps/openchallenges/apex/Caddyfile +++ b/apps/openchallenges/apex/Caddyfile @@ -1,4 +1,4 @@ -:80 { +:8000 { handle_path /api-docs* { reverse_proxy {env.API_DOCS_HOST}:{env.API_DOCS_PORT} } diff --git a/apps/openchallenges/apex/Dockerfile b/apps/openchallenges/apex/Dockerfile index 95819eea07..e89c1410ac 100644 --- a/apps/openchallenges/apex/Dockerfile +++ b/apps/openchallenges/apex/Dockerfile @@ -3,6 +3,6 @@ FROM caddy:2.8.4 RUN apk add --no-cache curl jq HEALTHCHECK --interval=2s --timeout=3s --retries=20 --start-period=5s \ - CMD curl --fail --silent "localhost:80/health" | jq '.status' | grep healthy || exit 1 + CMD curl --fail --silent "localhost:8000/health" | jq '.status' | grep healthy || exit 1 COPY Caddyfile /etc/caddy/ \ No newline at end of file diff --git a/docker/openchallenges/services/apex.yml b/docker/openchallenges/services/apex.yml index 9cb9d06c0c..606beecbdb 100644 --- a/docker/openchallenges/services/apex.yml +++ b/docker/openchallenges/services/apex.yml @@ -5,12 +5,12 @@ services: restart: always env_file: - ../../../apps/openchallenges/apex/.env - volumes: - - ../../../apps/openchallenges/apex/Caddyfile:/etc/caddy/Caddyfile + # volumes: + # - ../../../apps/openchallenges/apex/Caddyfile:/etc/caddy/Caddyfile networks: - openchallenges ports: - - '8000:80' + - '8000:8000' depends_on: openchallenges-api-docs: condition: service_healthy