diff --git a/Dockerfile b/Dockerfile index 5351a70..f7bfbe5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM python:3.11-slim -RUN apt-get update && apt-get install -y libpq-dev gcc \ +RUN apt-get update \ + && apt-get install -y libpq-dev gcc libexpat1 \ && rm -rf /var/lib/apt/lists/* WORKDIR /app diff --git a/app/main.py b/app/main.py index 1a7caf2..cd13a2c 100644 --- a/app/main.py +++ b/app/main.py @@ -1,38 +1,12 @@ import os import psycopg2 import time - - -DB_USER = os.getenv("POSTGRES_USER"); -DB_PASSWWORD = os.getenv("POSTGRES_PASSWORD"); -DB_NAME = os.getenv("POSTGRES_DB"); -DB_HOST = os.getenv("POSTGRES_HOST"); - - - -def connect_db(): - while True: - try: - conn = psycopg2.connect( - host=DB_HOST, - database=DB_NAME, - user=DB_USER, - password=DB_PASSWWORD - ) - print("Connected to the database successfully!") - return conn - except psycopg2.OperationalError as e: - print(f"Database connection failed: {e}") - time.sleep(3) +import pystac_client +import geogif +import stackstac if __name__ == "__main__": print("starting app.") - # conn = connect_db(); - # cursor = conn.cursor() - # cursor.execute("SELECT postgis_full_version();") - - # print("obst", cursor.fetchone()); - diff --git a/app/requirements.txt b/app/requirements.txt index 80ac694..22f03e7 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,2 +1,5 @@ psycopg2-binary==2.9.3 -SQLAlchemy==1.4.36 \ No newline at end of file +SQLAlchemy==1.4.36 +pystac_client +geogif +stackstac diff --git a/docker-compose.yml b/docker-compose.yml index ad81c79..cb02c56 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,42 +1,9 @@ services: - geo-db-postgis: - image: postgis/postgis:15-3.3 - container_name: geo-db-postgis - environment: - POSTGRES_USER: ${GEODB_USER} - POSTGRES_PASSWORD: ${GEODB_PW} - POSTGRES_DB: ${GEODB_NAME} - ports: - - "127.0.0.1:5432:5432" - volumes: - - pgdata:/var/lib/postgresql/data - networks: - - backend - - - app: build: . - container_name: geo-app + container_name: copernicus-app environment: PYTHONUNBUFFERED: 1 - POSTGRES_USER: ${GEODB_USER} - POSTGRES_PASSWORD: ${GEODB_PW} - POSTGRES_DB: ${GEODB_NAME} - POSTGRES_HOST: geo-db-postgis - depends_on: - - geo-db-postgis - networks: - - backend - - - -volumes: - pgdata: - driver: local - -networks: - backend: - driver: bridge - external: true + + \ No newline at end of file