diff --git a/project/docker-compose.yml b/project/docker-compose.yml index 5044d70..d1203e8 100644 --- a/project/docker-compose.yml +++ b/project/docker-compose.yml @@ -12,8 +12,9 @@ services: - "traefik.http.middlewares.ff-frontend-stripprefix.stripprefix.prefixes=/ff" - "traefik.http.routers.ff-frontend.middlewares=ff-frontend-stripprefix" networks: - - traefik_default - - app-network + - proxy + expose: + - "80" db: image: postgres:17-alpine @@ -25,7 +26,7 @@ services: timeout: 5s retries: 5 networks: - - app-network + - proxy coordinator: build: @@ -34,12 +35,14 @@ services: env_file: - .env environment: - - OCR_SERVICE_URL=http://ocr:5000 + - OCR_SERVICE_URL=http://ocr:5051 + - SPACY_SERVICE_URL=http://spacy:5052/extract + - EXXETA_SERVICE_URL=http://exxeta:5053/extract depends_on: db: condition: service_healthy healthcheck: - test: wget --spider --no-verbose http://127.0.0.1:5000/health || exit 1 + test: wget --spider --no-verbose http://127.0.0.1:5050/health || exit 1 interval: 20s timeout: 10s retries: 10 @@ -47,12 +50,13 @@ services: - "traefik.enable=true" - "traefik.http.routers.ff-api.rule=PathPrefix(`/ff-api/`)" - "traefik.http.routers.ff-api.entrypoints=web" - - "traefik.http.services.ff-api.loadbalancer.server.port=5000" + - "traefik.http.services.ff-api.loadbalancer.server.port=5050" - "traefik.http.middlewares.ff-api-stripprefix.stripprefix.prefixes=/ff-api" - "traefik.http.routers.ff-api.middlewares=ff-api-stripprefix" networks: - - traefik_default - - app-network + - proxy + expose: + - "5050" ocr: build: @@ -61,21 +65,25 @@ services: env_file: - .env environment: - - EXXETA_SERVICE_URL=http://exxeta:5000/extract + - EXXETA_SERVICE_URL=http://exxeta:5053/extract - SPACY_SERVICE_URL=http://spacy:5052/extract - - COORDINATOR_URL=http://coordinator:5000 + - COORDINATOR_URL=http://coordinator:5050 networks: - - app-network + - proxy + expose: + - "5051" spacy: build: context: backend/spacy-service environment: - - VALIDATE_SERVICE_URL=http://validate:5000/validate + - VALIDATE_SERVICE_URL=http://validate:5054/validate volumes: - ./backend/spacy-service/spacy_training:/app/spacy_training networks: - - app-network + - proxy + expose: + - "5052" exxeta: build: @@ -84,10 +92,12 @@ services: env_file: - .env environment: - - VALIDATE_SERVICE_URL=http://validate:5000/validate - - COORDINATOR_URL=http://coordinator:5000 + - VALIDATE_SERVICE_URL=http://validate:5054/validate + - COORDINATOR_URL=http://coordinator:5050 networks: - - app-network + - proxy + expose: + - "5053" validate: build: @@ -96,12 +106,12 @@ services: env_file: - .env environment: - - COORDINATOR_URL=http://coordinator:5000 + - COORDINATOR_URL=http://coordinator:5050 networks: - - app-network + - proxy + expose: + - "5054" networks: - traefik_default: - external: true - app-network: - driver: bridge \ No newline at end of file + proxy: + external: true \ No newline at end of file diff --git a/project/frontend/Dockerfile b/project/frontend/Dockerfile index 69ae868..3118ac8 100644 --- a/project/frontend/Dockerfile +++ b/project/frontend/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /usr/src/app # install dependencies into temp directory # this will cache them and speed up future builds COPY package.json bun.lockb ./ -RUN bun install --frozen-lockfile +RUN bun install COPY . .