infra: remove webserver and fix healthcheck

noi-techpark · Nov 4, 2024 · 529fffc · 529fffc
1 parent 6a70f14
commit 529fffc
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 39 deletions.
diff --git a/infrastructure/docker-compose.build.yml b/infrastructure/docker-compose.build.yml
@@ -4,8 +4,3 @@ services:
     build:
       context: ../
       dockerfile: infrastructure/docker/Dockerfile
-  webserver:
-    image: ${DOCKER_IMAGE_WEBSERVER}:${DOCKER_TAG}
-    build:
-      context: ../
-      dockerfile: infrastructure/docker/Dockerfile.webserver
diff --git a/infrastructure/docker-compose.run.yml b/infrastructure/docker-compose.run.yml
@@ -1,15 +1,5 @@
 services:
 
-  webserver:
-    image: ${DOCKER_IMAGE_WEBSERVER}:${DOCKER_TAG}
-    depends_on:
-      conferences:
-        condition: service_started
-      push_notifications:
-        condition: service_started
-    ports:
-      - 8001:80
-
   conferences:
     image: ${DOCKER_IMAGE}:${DOCKER_TAG}
     command: uvicorn main:app --host 0.0.0.0 --reload # sleep 9999999999
@@ -20,6 +10,7 @@ services:
     volumes:
       - opencon-logs:/var/log/opencon
       - .aws.credentials:/root/.aws/credentials
+    healthcheck:
       test: curl --fail http://localhost:8000/openapi.json || exit 1
       interval: 30s
       retries: 3

diff --git a/infrastructure/docker/Dockerfile.webserver b/infrastructure/docker/Dockerfile.webserver