{"body":"From f6bbac8754359d49aca043d2494b5479dc4f0ad3 Mon Sep 17 00:00:00 2001\nFrom: Kartik Ohri <kartikohri13@gmail.com>\nDate: Tue, 13 Apr 2021 12:06:43 +0200\nSubject: [PATCH] Use external mb db\n\n---\n default_config.py             |  4 ++--\n docker/docker-compose.dev.yml | 22 +++++++---------------\n 2 files changed, 9 insertions(+), 17 deletions(-)\n\ndiff --git a/default_config.py b/default_config.py\nindex cc556d35..a3233a6b 100644\n--- a/default_config.py\n+++ b/default_config.py\n@@ -4,11 +4,11 @@ DEBUG = False\n SECRET_KEY = \"CHANGE_THIS\"\n \n # Database\n-SQLALCHEMY_DATABASE_URI = \"postgresql://critiquebrainz:critiquebrainz@db:5432/critiquebrainz\"\n+SQLALCHEMY_DATABASE_URI = \"postgresql://critiquebrainz:critiquebrainz@cbdb:5432/critiquebrainz\"\n SQLALCHEMY_TRACK_MODIFICATIONS = False\n \n # MusicBrainz Database\n-MB_DATABASE_URI = \"postgresql://musicbrainz:musicbrainz@musicbrainz_db:5432/musicbrainz_db\"\n+MB_DATABASE_URI = \"postgresql://musicbrainz:musicbrainz@db:5432/musicbrainz_db\"\n \n # Redis\n REDIS_HOST = \"critiquebrainz_redis\"\ndiff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml\nindex a35e2ab8..a6971efd 100644\n--- a/docker/docker-compose.dev.yml\n+++ b/docker/docker-compose.dev.yml\n@@ -6,7 +6,7 @@ volumes:\n \n services:\n \n-  db:\n+  cbdb:\n     image: postgres:12.3\n     environment:\n       POSTGRES_USER: critiquebrainz\n@@ -31,27 +31,15 @@ services:\n       FLASK_APP: critiquebrainz.frontend\n       FLASK_ENV: development\n     ports:\n-      - \"80:80\"\n+      - \"666:80\"\n     depends_on:\n-      - db\n+      - cbdb\n       - critiquebrainz_redis\n-      - musicbrainz_db\n       - static_builder\n \n   critiquebrainz_redis:\n     image: redis:4.0-alpine\n \n-  musicbrainz_db:\n-    image: metabrainz/musicbrainz-test-database:beta\n-    volumes:\n-      - ../data/mbdata:/var/lib/postgresql/data/pgdata:z\n-    environment:\n-      PGDATA: /var/lib/postgresql/data/pgdata\n-      MB_IMPORT_DUMPS: \"true\"\n-      POSTGRES_HOST_AUTH_METHOD: \"trust\"\n-    ports:\n-      - \"5430:5432\"\n-\n   static_builder:\n     build:\n       context: ..\n@@ -59,3 +47,7 @@ services:\n     command: npm run dev\n     volumes:\n       - ..:/code:z\n+networks:\n+  default:\n+    external:\n+      name: musicbrainzdocker_default\n-- \n2.17.1","name":"sample.patch","extension":"patch","url":"https://www.irccloud.com/pastebin/yNZLa5ex/sample.patch","modified":1618308467,"id":"yNZLa5ex","size":2217,"lines":81,"own_paste":false,"theme":"","date":1618308467}