From 2dd1b024fae8d29502281b2d13a770a675167938 Mon Sep 17 00:00:00 2001 From: c8y3 <25362953+c8y3@users.noreply.github.com> Date: Fri, 10 Jan 2025 13:26:11 +0100 Subject: [PATCH] Removed things that are related to the new frontend in order to get the CI working again --- docker-compose.dev.yml | 26 +++----------------------- docker/nginx/nginx.conf | 12 ------------ 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 73b598ce8..4bf00cfdd 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -44,29 +44,9 @@ services: volumes: - ./source/app:/iriswebapp/app - ./ui/dist:/iriswebapp/static - - frontend: - image: node:22-alpine - container_name: iris_sveltekit_frontend - working_dir: /app - environment: - - IRIS_SVELTEKIT_FRONTEND_DIR=${IRIS_SVELTEKIT_FRONTEND_DIR:-../frontend} - - PUBLIC_EXTERNAL_API_URL=https://127.0.0.1 - - PUBLIC_INTERNAL_API_URL=http://app:8000 - - PUBLIC_USE_MOCK_API_DATA=false - - ORIGIN=https://127.0.0.1 - - PROTOCOL_HEADER=x-forwarded-proto - - HOST_HEADER=x-forwarded-host - - NODE_ENV=development - volumes: - - ${IRIS_SVELTEKIT_FRONTEND_DIR}:/app # Map the frontend directory dynamically - - /app/node_modules # Ensure `node_modules` is preserved inside the container - ports: - - "5173:5173" - command: sh -c "npm install && npm run dev -- --host" - networks: - - iris_backend - - iris_frontend + healthcheck: + test: curl --head --fail http://localhost:8000 || exit 1 + start_period: 60s worker: extends: diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index 0f4c2f663..eb54e5bb8 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -120,18 +120,6 @@ http { add_header Front-End-Https on; location / { - proxy_pass http://${IRIS_FRONTEND_SERVER}:${IRIS_FRONTEND_PORT}; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header Origin $http_origin; - } - - location /api/v2/ { proxy_pass http://${IRIS_UPSTREAM_SERVER}:${IRIS_UPSTREAM_PORT}; location ~ ^/(manage/templates/add|manage/cases/upload_files) {