Skip to content

Commit 019c233

Browse files
authored
Merge pull request #6 from sunu/single-endpoint
Refactor search endpoint and frontend
2 parents 940f67f + 6ffc463 commit 019c233

23 files changed

Lines changed: 1041 additions & 1646 deletions

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: docker/build-push-action@v5
3838
with:
3939
context: .
40-
file: ./Dockerfile.api
40+
file: ./Dockerfile
4141
push: true
4242
tags: ${{ steps.meta-api.outputs.tags }}
4343
labels: ${{ steps.meta-api.outputs.labels }}

.github/workflows/helm-publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434

3535
- name: Package Helm chart
3636
run: |
37+
helm dependency update helm/geodini
38+
mkdir -p ./chart-packages
3739
helm package helm/geodini --destination ./chart-packages
3840
3941
- name: Push Helm chart to GHCR
File renamed without changes.

Dockerfile.frontend

Lines changed: 0 additions & 12 deletions
This file was deleted.

docker-compose.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ services:
22
init-ingest-data:
33
build:
44
context: .
5-
dockerfile: Dockerfile.api
65
volumes:
76
- ./geodini:/app/geodini
87
- ./data:/app/data
@@ -18,7 +17,6 @@ services:
1817
api:
1918
build:
2019
context: .
21-
dockerfile: Dockerfile.api
2220
ports:
2321
- "29000:9000"
2422
environment:
@@ -32,6 +30,7 @@ services:
3230
- REDIS_HOST=redis
3331
- REDIS_PORT=6379
3432
- REDIS_DB=0
33+
- DISABLE_CACHE=${DISABLE_CACHE:-false}
3534
env_file:
3635
- .env
3736
volumes:
@@ -59,7 +58,6 @@ services:
5958
mcp:
6059
build:
6160
context: .
62-
dockerfile: Dockerfile.api
6361
ports:
6462
- "29001:9001"
6563
environment:
@@ -72,6 +70,7 @@ services:
7270
- REDIS_HOST=redis
7371
- REDIS_PORT=6379
7472
- REDIS_DB=0
73+
- DISABLE_CACHE=${DISABLE_CACHE:-false}
7574
env_file:
7675
- .env
7776
volumes:
@@ -87,13 +86,16 @@ services:
8786
frontend:
8887
build:
8988
context: .
90-
dockerfile: Dockerfile.frontend
9189
ports:
92-
- "20080:80"
90+
- "20080:8501"
9391
volumes:
94-
- ./frontend:/usr/share/nginx/html
92+
- ./frontend:/app/frontend
93+
- ./geodini:/app/geodini
9594
environment:
96-
- GEODINI_API_URL=http://localhost:29000
95+
- STREAMLIT_SERVER_PORT=8501
96+
- STREAMLIT_SERVER_ADDRESS=0.0.0.0
97+
- STREAMLIT_SERVER_FILE_WATCHER_TYPE=watchdog
98+
command: ["streamlit", "run", "frontend/app.py", "--server.port=8501", "--server.address=0.0.0.0", "--server.fileWatcherType=watchdog"]
9799
depends_on:
98100
- api
99101

0 commit comments

Comments
 (0)