Skip to content

Commit

Permalink
Removed things that are related to the new frontend in order to get t…
Browse files Browse the repository at this point in the history
…he CI working again
  • Loading branch information
c8y3 committed Jan 10, 2025
1 parent dee51d5 commit 2dd1b02
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 35 deletions.
26 changes: 3 additions & 23 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 0 additions & 12 deletions docker/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 2dd1b02

Please sign in to comment.