fix: remove local setup of config & docker-compose

hotosm · Dec 13, 2024 · 4e46ff2 · 4e46ff2
1 parent 014045c
commit 4e46ff2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,9 +8,6 @@ volumes:
   frontend-html:
     name: drone-tm-frontend-html
 
-  odm-media:
-  odm-db-data:
-
 services:
   backend:
     build:
@@ -85,26 +82,6 @@ services:
       - dtm-network
     restart: unless-stopped
 
-  odm-api:
-    image: docker.io/opendronemap/nodeodm:3.5.3
-    # This is hardcoded by default
-    hostname: webodm-node-odm-1
-    container_name: odm-api
-    networks:
-      - dtm-network
-    ports:
-      - 3001:3000
-    restart: unless-stopped
-    oom_score_adj: 500
-
-  odm-broker:
-    image: docker.io/redis:7.0.10
-    container_name: odm-broker
-    networks:
-      - dtm-network
-    restart: unless-stopped
-    oom_score_adj: -500
-
   createbuckets:
     image: "docker.io/minio/minio:${MINIO_TAG:-RELEASE.2024-08-03T04-33-23Z}"
     entrypoint: >

diff --git a/src/backend/app/config.py b/src/backend/app/config.py
@@ -81,14 +81,16 @@ def assemble_db_connection(cls, v: Optional[str], info: ValidationInfo) -> Any:
         return pg_url
 
     FRONTEND_URL: str = "http://localhost:3040"
-    BACKEND_URL: str = "http://backend:8000"
+    BACKEND_URL: str = "http://localhost:8000"
 
     S3_ENDPOINT: str = "http://s3:9000"
     S3_ACCESS_KEY: Optional[str] = ""
     S3_SECRET_KEY: Optional[str] = ""
     S3_BUCKET_NAME: str = "dtm-data"
     S3_DOWNLOAD_ROOT: Optional[str] = None
 
+    JAXA_AUTH_TOKEN: Optional[str] = ""
+
     ALGORITHM: str = "HS256"
     ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 * 60 * 24 * 1  # 1 day
     REFRESH_TOKEN_EXPIRE_MINUTES: int = 60 * 60 * 24 * 8  # 8 day
@@ -106,9 +108,8 @@ def assemble_db_connection(cls, v: Optional[str], info: ValidationInfo) -> Any:
     SMTP_PASSWORD: Optional[str] = None
     EMAILS_FROM_EMAIL: Optional[EmailStr] = None
     EMAILS_FROM_NAME: Optional[str] = "Drone Tasking Manager"
+
     NODE_ODM_URL: Optional[str] = "http://odm-api:3000"
-    print("*" * 100, NODE_ODM_URL)
-    # NODE_ODM_URL: Optional[str] = "https://odm.dronetm.org/?token=a24ba366-7c11-43e4-992a-3119d6dad089"
 
     @computed_field
     @property