From d94bf75e71603295c60a3f5405a48fc793e1fbba Mon Sep 17 00:00:00 2001 From: Splines Date: Mon, 6 Nov 2023 19:24:59 +0100 Subject: [PATCH 1/4] Add pgadmin to dev docker compose --- docker/development/docker-compose.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index a5bd44651..231a876a5 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -32,6 +32,21 @@ services: source: db-data target: /var/lib/postgresql/data + pgadmin: + image: dpage/pgadmin4 + ports: + - "5050:80" + environment: + PGADMIN_DEFAULT_EMAIL: admin@mampf.de + PGADMIN_DEFAULT_PASSWORD: mampf + volumes: + - pgadmin:/var/lib/pgadmin + # Pre-load server definition into pgAdmin (so that no manual setup via + # the web interface is required). See "pgadmin4/servers.json" in: + # https://www.pgadmin.org/docs/pgadmin4/latest/container_deployment.html#mapped-files-and-directories + # and this answer: https://forums.docker.com/t/automatically-connect-pgadmin-to-a-postgresql-volume-on-which-there-is-a-database-and-automatically-load-a-schema-present-on-a-sql-file-with-docker-compose/124647/2 + - config/db-pgadmin-config.json:/pgadmin4/servers.json + mailcatcher: restart: on-failure:10 image: dockage/mailcatcher:latest @@ -56,6 +71,8 @@ services: image: mampf:development environment: RAILS_ENV: docker_development + # If you change these variables, make sure to adapt accordingly in + # config/db-pgadmin-config.json DEVELOPMENT_DATABASE_ADAPTER: postgresql DEVELOPMENT_DATABASE_DATABASE: mampf DEVELOPMENT_DATABASE_INTERACTIONS: interactions @@ -164,5 +181,6 @@ volumes: submissions: public: db-data: + pgadmin: solr-data: sprockets-cache: From 64bc297e3bcd7e5fd0f0d15ff74f20bc74d525f3 Mon Sep 17 00:00:00 2001 From: Splines Date: Mon, 6 Nov 2023 19:25:13 +0100 Subject: [PATCH 2/4] Add pgadmin configuration --- config/db-pgadmin-config.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 config/db-pgadmin-config.json diff --git a/config/db-pgadmin-config.json b/config/db-pgadmin-config.json new file mode 100644 index 000000000..64a214adc --- /dev/null +++ b/config/db-pgadmin-config.json @@ -0,0 +1,12 @@ +{ + "Servers": { + "1": { + "Name": "mampf-postgres", + "Group": "Servers", + "Host": "db", + "Port": 5432, + "MaintenanceDB": "mampf", + "Username": "mampf" + } + } +} \ No newline at end of file From 606b792bf2303a1eedf95ba5718b041a4e47b051 Mon Sep 17 00:00:00 2001 From: Splines Date: Mon, 6 Nov 2023 20:46:57 +0100 Subject: [PATCH 3/4] Fix pgadmin config file docker binding --- ...{db-pgadmin-config.json => db-pgadmin.json} | 0 docker/development/docker-compose.yml | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) rename config/{db-pgadmin-config.json => db-pgadmin.json} (100%) diff --git a/config/db-pgadmin-config.json b/config/db-pgadmin.json similarity index 100% rename from config/db-pgadmin-config.json rename to config/db-pgadmin.json diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index 231a876a5..5a1d73c06 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -37,15 +37,17 @@ services: ports: - "5050:80" environment: - PGADMIN_DEFAULT_EMAIL: admin@mampf.de - PGADMIN_DEFAULT_PASSWORD: mampf + PGADMIN_DEFAULT_EMAIL: admin@mampf.edu + PGADMIN_DEFAULT_PASSWORD: pgmampf volumes: - pgadmin:/var/lib/pgadmin # Pre-load server definition into pgAdmin (so that no manual setup via - # the web interface is required). See "pgadmin4/servers.json" in: - # https://www.pgadmin.org/docs/pgadmin4/latest/container_deployment.html#mapped-files-and-directories - # and this answer: https://forums.docker.com/t/automatically-connect-pgadmin-to-a-postgresql-volume-on-which-there-is-a-database-and-automatically-load-a-schema-present-on-a-sql-file-with-docker-compose/124647/2 - - config/db-pgadmin-config.json:/pgadmin4/servers.json + # the web interface is required). See "pgadmin4/servers.json" here: + # -> https://www.pgadmin.org/docs/pgadmin4/latest/container_deployment.html#mapped-files-and-directories + # -> https://forums.docker.com/t/automatically-connect-pgadmin-to-a-postgresql-volume-on-which-there-is-a-database-and-automatically-load-a-schema-present-on-a-sql-file-with-docker-compose/124647/2 + - type: bind + source: ../../config/db-pgadmin.json + target: /pgadmin4/servers.json mailcatcher: restart: on-failure:10 @@ -112,8 +114,8 @@ services: PROJECT_EMAIL_MAILBOX: INBOX BLOG: https://mampf.blog # uncomment DB_SQL_PRESEED_URL and UPLOADS_PRESEED_URL to enable db preseeding - # DB_SQL_PRESEED_URL: "https://heibox.uni-heidelberg.de/d/6fb4a9d2e7f54d8b9931/files/?p=%2F20220923120841_mampf.sql&dl=1" - # UPLOADS_PRESEED_URL: "https://heibox.uni-heidelberg.de/f/1c4804dcd78446139fd9/?dl=1" + DB_SQL_PRESEED_URL: "https://heibox.uni-heidelberg.de/d/6fb4a9d2e7f54d8b9931/files/?p=%2F20220923120841_mampf.sql&dl=1" + UPLOADS_PRESEED_URL: "https://heibox.uni-heidelberg.de/f/1c4804dcd78446139fd9/?dl=1" volumes: - type: bind source: ../../ From 2693021638a700708d74b281896f3136d2ac632e Mon Sep 17 00:00:00 2001 From: Splines Date: Mon, 6 Nov 2023 20:48:12 +0100 Subject: [PATCH 4/4] Fix unwanted env comment --- docker/development/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/development/docker-compose.yml b/docker/development/docker-compose.yml index 5a1d73c06..74bae1284 100644 --- a/docker/development/docker-compose.yml +++ b/docker/development/docker-compose.yml @@ -114,8 +114,8 @@ services: PROJECT_EMAIL_MAILBOX: INBOX BLOG: https://mampf.blog # uncomment DB_SQL_PRESEED_URL and UPLOADS_PRESEED_URL to enable db preseeding - DB_SQL_PRESEED_URL: "https://heibox.uni-heidelberg.de/d/6fb4a9d2e7f54d8b9931/files/?p=%2F20220923120841_mampf.sql&dl=1" - UPLOADS_PRESEED_URL: "https://heibox.uni-heidelberg.de/f/1c4804dcd78446139fd9/?dl=1" + # DB_SQL_PRESEED_URL: "https://heibox.uni-heidelberg.de/d/6fb4a9d2e7f54d8b9931/files/?p=%2F20220923120841_mampf.sql&dl=1" + # UPLOADS_PRESEED_URL: "https://heibox.uni-heidelberg.de/f/1c4804dcd78446139fd9/?dl=1" volumes: - type: bind source: ../../