Skip to content
This repository has been archived by the owner on Nov 5, 2022. It is now read-only.

44 provide access to multiple named databases #56

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ COPY ./scripts ./scripts
COPY entrypoint.sh ./entrypoint.sh
COPY mch.dbn ./mch.dbn
COPY MCHtablasycampos.def ./MCHtablasycampos.def
COPY climsoft-multi-deployment.yml ./climsoft-multi-deployment.yml

RUN ["chmod", "+x", "/code/scripts/load_initial_surface_data.sh"]

Expand Down
3 changes: 3 additions & 0 deletions climsoft-multi-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
test:
NAME: Climsoft Test
DATABASE_URI: "mysql+mysqldb://root:password@mysql:3306/mariadb_climsoft_test_db_v4"
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
- PYGEOAPI_CONFIG=/code/pygeoapi-config.yml
- PYGEOAPI_OPENAPI=/code/pygeoapi-openapi.yml
- PYTHONPATH=/code/surface/api
- CLIMSOFT_DATABASE_URI=mysql+mysqldb://root:password@mysql:3306/mariadb_climsoft_test_db_v4
- CLIMSOFT_DATABASE_URI=mysql+mysqldb://root:password@mysql:63306/mariadb_climsoft_test_db_v4
- CLIMSOFT_SECRET_KEY=climsoft-secret-key
- AUTH_DB_URI=postgresql+psycopg2://dba:dba@opencdms_surface_db:5432/surface
- SURFACE_DB_NAME=surface
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Flask-RESTful
mch-api @ git+https://github.com/opencdms/mch-api.git@main
mysqlclient
numpy
opencdms @ git+https://github.com/opencdms/pyopencdms.git@main
opencdms@git+https://github.com/opencdms/pyopencdms.git@main
climsoft_api @ git+https://github.com/openclimateinitiative/climsoft-api.git@main
psycopg2
pandas
Expand All @@ -37,3 +37,4 @@ starlette
uvicorn
Werkzeug
opencdms_process @ git+https://github.com/opencdms/opencdms-process.git@main
pyyaml
Loading