# Pastebin yNZLa5ex From f6bbac8754359d49aca043d2494b5479dc4f0ad3 Mon Sep 17 00:00:00 2001 From: Kartik Ohri Date: Tue, 13 Apr 2021 12:06:43 +0200 Subject: [PATCH] Use external mb db --- default_config.py | 4 ++-- docker/docker-compose.dev.yml | 22 +++++++--------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/default_config.py b/default_config.py index cc556d35..a3233a6b 100644 --- a/default_config.py +++ b/default_config.py @@ -4,11 +4,11 @@ DEBUG = False SECRET_KEY = "CHANGE_THIS" # Database -SQLALCHEMY_DATABASE_URI = "postgresql://critiquebrainz:critiquebrainz@db:5432/critiquebrainz" +SQLALCHEMY_DATABASE_URI = "postgresql://critiquebrainz:critiquebrainz@cbdb:5432/critiquebrainz" SQLALCHEMY_TRACK_MODIFICATIONS = False # MusicBrainz Database -MB_DATABASE_URI = "postgresql://musicbrainz:musicbrainz@musicbrainz_db:5432/musicbrainz_db" +MB_DATABASE_URI = "postgresql://musicbrainz:musicbrainz@db:5432/musicbrainz_db" # Redis REDIS_HOST = "critiquebrainz_redis" diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index a35e2ab8..a6971efd 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -6,7 +6,7 @@ volumes: services: - db: + cbdb: image: postgres:12.3 environment: POSTGRES_USER: critiquebrainz @@ -31,27 +31,15 @@ services: FLASK_APP: critiquebrainz.frontend FLASK_ENV: development ports: - - "80:80" + - "666:80" depends_on: - - db + - cbdb - critiquebrainz_redis - - musicbrainz_db - static_builder critiquebrainz_redis: image: redis:4.0-alpine - musicbrainz_db: - image: metabrainz/musicbrainz-test-database:beta - volumes: - - ../data/mbdata:/var/lib/postgresql/data/pgdata:z - environment: - PGDATA: /var/lib/postgresql/data/pgdata - MB_IMPORT_DUMPS: "true" - POSTGRES_HOST_AUTH_METHOD: "trust" - ports: - - "5430:5432" - static_builder: build: context: .. @@ -59,3 +47,7 @@ services: command: npm run dev volumes: - ..:/code:z +networks: + default: + external: + name: musicbrainzdocker_default -- 2.17.1