diff --git a/app/daemon/corpus_utils.py b/app/daemon/corpus_utils.py index 1703521a5f96afa1084ec5f3d17768e4279fefcf..4d807c145287276ee845c3b24c7681f5e2bca034 100644 --- a/app/daemon/corpus_utils.py +++ b/app/daemon/corpus_utils.py @@ -143,7 +143,7 @@ def _create_cqpserver_container(corpus): ''' ## Name ## ''' name = f'cqpserver_{corpus.id}' ''' ## Network ## ''' - network = 'nopaque_default' + network = f'{current_app.config["DOCKER_NETWORK_NAME"]}' ''' ## Volumes ## ''' volumes = [] ''' ### Corpus data volume ### ''' diff --git a/config.py b/config.py index 4eba99d2399285f4d05e5658554c0fd7940bd675..97e810eed9bae69282d106076fcf19606d35d7b8 100644 --- a/config.py +++ b/config.py @@ -11,6 +11,9 @@ load_dotenv(os.path.join(basedir, '.env')) class Config: + ''' Docker ''' + DOCKER_NETWORK_NAME = os.environ.get('DOCKER_NETWORK_NAME', 'nopaque_default') + ''' APIFairy ''' APIFAIRY_TITLE = 'nopaque' APIFAIRY_VERSION = '0.0.1' diff --git a/docker-compose.yml b/docker-compose.yml index f668e00d987ab7f682478976a42f9df8aabf5f1c..52f011e6acbbfd388263b67bea9138d160c2afa0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,9 @@ version: "3.5" +networks: + default: + name: "${DOCKER_NETWORK_NAME:-nopaque_default}" + services: db: env_file: db.env