diff --git a/docker-compose.yaml b/docker-compose.yaml index 6113dd4..91733dc 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -26,12 +26,12 @@ services: context: ./python entrypoint: bash -c "pip install -r requirements.txt && /code/run_app_prod.sh" environment: - - POSTGRES_HOST=mazash_db_1.mazash_db_networks - - POSTGRES_DB=dejavu - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=password - - IPFS_HOST=ipfs - - IPFS_PORT=5001 + - DATABASE_HOST=mazash_db_1.mazash_db_networks + - DATABASE_DB=dejavu + - DATABASE_USER=postgres + - DATABASE_PASSWORD=password + - DATABASE_TYPE=postgres + - IPFS_HOST=/dns/ipfs/tcp/5001 volumes: - .:/code working_dir: /code diff --git a/src/endpoints/mazash.py b/src/endpoints/mazash.py index 01b2692..488ea73 100644 --- a/src/endpoints/mazash.py +++ b/src/endpoints/mazash.py @@ -8,12 +8,12 @@ mazash = Blueprint(name="mazash", import_name=__name__) config = { "database" : { - "host" : os.getenv("POSTGRES_HOST", "db"), - "user" : os.getenv("POSTGRES_USER","postgres"), - "password" : os.getenv("POSTGRES_PASSWORD", "changeme"), - "database" : os.getenv("POSTGRES_DB", "dejavu") + "host" : os.getenv("DATABASE_HOST", "db"), + "user" : os.getenv("DATABASE_USER","postgres"), + "password" : os.getenv("DATABASE_PASSWORD", "changeme"), + "database" : os.getenv("DATABASE_DB", "dejavu") }, - "database_type": "postgres" + "database_type": os.getenv("DATABASE_TYPE", "mysql") } def transform_resultToJsonable(r): @@ -51,7 +51,7 @@ def fingerprint(): tags: - mazash """ - ipfs_api = ipfshttpclient.connect(os.getenv("IPFS_HOST"), int(os.getenv("IPFS_PORT"))) + ipfs_api = ipfshttpclient.connect(os.getenv("IPFS_HOST")) djv = Dejavu(config) if request.is_json : ipfs_hash = request.json.get("cid") @@ -91,7 +91,7 @@ def recognize(): tags: - mazash """ - ipfs_api = ipfshttpclient.connect(os.getenv("IPFS_HOST"), int(os.getenv("IPFS_PORT"))) + ipfs_api = ipfshttpclient.connect(os.getenv("IPFS_HOST")) djv = Dejavu(config) if request.is_json : ipfs_hash = request.json.get("cid")