From cfccd947f420c6eefcc8e723f81b16672eb45436 Mon Sep 17 00:00:00 2001 From: AYEG <> Date: Tue, 8 Jan 2019 01:18:19 +0100 Subject: [PATCH 1/2] update image, env-pgadmin.env variable names --- {{cookiecutter.project_slug}}/docker-compose.shared.admin.yml | 2 +- {{cookiecutter.project_slug}}/env-pgadmin.env | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml b/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml index 2d3e2b2..506835c 100644 --- a/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml +++ b/{{cookiecutter.project_slug}}/docker-compose.shared.admin.yml @@ -1,7 +1,7 @@ version: '3' services: pgadmin: - image: fenglc/pgadmin4 + image: dpage/pgadmin4 depends_on: - db env_file: diff --git a/{{cookiecutter.project_slug}}/env-pgadmin.env b/{{cookiecutter.project_slug}}/env-pgadmin.env index 2410314..802fc18 100644 --- a/{{cookiecutter.project_slug}}/env-pgadmin.env +++ b/{{cookiecutter.project_slug}}/env-pgadmin.env @@ -1,2 +1,3 @@ -PG_ADMIN_DEFAULT_USER={{cookiecutter.pgadmin_default_user}} +PGADMIN_LISTEN_PORT=5050 +PG_ADMIN_DEFAULT_EMAIL={{cookiecutter.pgadmin_default_user}} PG_ADMIN_DEFAULT_PASSWORD={{cookiecutter.pgadmin_default_user_password}} From 7fa54a2e579414cf9084250e33e383cb31596e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Fri, 11 Jan 2019 14:22:42 +0400 Subject: [PATCH 2/2] :bug: Fix setting PGAdmin env vars --- {{cookiecutter.project_slug}}/env-pgadmin.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/env-pgadmin.env b/{{cookiecutter.project_slug}}/env-pgadmin.env index 802fc18..296cbe8 100644 --- a/{{cookiecutter.project_slug}}/env-pgadmin.env +++ b/{{cookiecutter.project_slug}}/env-pgadmin.env @@ -1,3 +1,3 @@ PGADMIN_LISTEN_PORT=5050 -PG_ADMIN_DEFAULT_EMAIL={{cookiecutter.pgadmin_default_user}} -PG_ADMIN_DEFAULT_PASSWORD={{cookiecutter.pgadmin_default_user_password}} +PGADMIN_DEFAULT_EMAIL={{cookiecutter.pgadmin_default_user}} +PGADMIN_DEFAULT_PASSWORD={{cookiecutter.pgadmin_default_user_password}}