From 3279108173d25cc527f175b61434af37c47109c6 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Fri, 14 Feb 2020 21:30:01 +0000 Subject: [PATCH 1/3] Fix postgres-db initialization requires a password to start now ( https://github.com/docker-library/postgres/pull/658 ) Signed-off-by: Colin Hutchinson --- releases/nightly-build/compose-files/docker-compose-nexus.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/releases/nightly-build/compose-files/docker-compose-nexus.yml b/releases/nightly-build/compose-files/docker-compose-nexus.yml index d1091da..38caccd 100644 --- a/releases/nightly-build/compose-files/docker-compose-nexus.yml +++ b/releases/nightly-build/compose-files/docker-compose-nexus.yml @@ -166,6 +166,7 @@ services: environment: - 'POSTGRES_DB=kong' - 'POSTGRES_USER=kong' + - 'POSTGRES_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}' kong-migrations: image: kong:1.3.0 @@ -177,6 +178,7 @@ services: environment: - 'KONG_DATABASE=postgres' - 'KONG_PG_HOST=kong-db' + - 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}' command: > /bin/sh -cx 'until /consul/scripts/consul-svc-healthy.sh kong-db; @@ -211,6 +213,7 @@ services: environment: - 'KONG_DATABASE=postgres' - 'KONG_PG_HOST=kong-db' + - 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}' - 'KONG_PROXY_ACCESS_LOG=/dev/stdout' - 'KONG_ADMIN_ACCESS_LOG=/dev/stdout' - 'KONG_PROXY_ERROR_LOG=/dev/stderr' From 26459527fbc81b039798367aef7bf196d2d0f5b7 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Fri, 14 Feb 2020 21:30:01 +0000 Subject: [PATCH 2/3] Fix postgres-db initialization requires a password to start now ( https://github.com/docker-library/postgres/pull/658 ) Signed-off-by: Colin Hutchinson --- .../nightly-build/compose-files/docker-compose-nexus-arm64.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml b/releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml index 5bb65d9..06b43df 100644 --- a/releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml +++ b/releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml @@ -166,6 +166,7 @@ services: environment: - 'POSTGRES_DB=kong' - 'POSTGRES_USER=kong' + - 'POSTGRES_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}' kong-migrations: image: kong:1.3.0-ubuntu @@ -177,6 +178,7 @@ services: environment: - 'KONG_DATABASE=postgres' - 'KONG_PG_HOST=kong-db' + - 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}' command: > /bin/sh -cx 'until /consul/scripts/consul-svc-healthy.sh kong-db; @@ -211,6 +213,7 @@ services: environment: - 'KONG_DATABASE=postgres' - 'KONG_PG_HOST=kong-db' + - 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}' - 'KONG_PROXY_ACCESS_LOG=/dev/stdout' - 'KONG_ADMIN_ACCESS_LOG=/dev/stdout' - 'KONG_PROXY_ERROR_LOG=/dev/stderr' From b8e85d835f29e2e403984256fef7eda702d2a15e Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Fri, 14 Feb 2020 21:38:30 +0000 Subject: [PATCH 3/3] Include the pg database initialization password fix to Fuji Signed-off-by: Colin Hutchinson --- releases/fuji/compose-files/docker-compose-fuji.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/releases/fuji/compose-files/docker-compose-fuji.yml b/releases/fuji/compose-files/docker-compose-fuji.yml index b8a5846..dab08ba 100644 --- a/releases/fuji/compose-files/docker-compose-fuji.yml +++ b/releases/fuji/compose-files/docker-compose-fuji.yml @@ -150,7 +150,7 @@ services: environment: - 'POSTGRES_DB=kong' - 'POSTGRES_USER=kong' - + - 'POSTGRES_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}' kong-migrations: image: kong:1.3.0 container_name: kong-migrations @@ -161,6 +161,7 @@ services: environment: - 'KONG_DATABASE=postgres' - 'KONG_PG_HOST=kong-db' + - 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}' command: > /bin/sh -cx 'until /consul/scripts/consul-svc-healthy.sh kong-db; @@ -194,6 +195,7 @@ services: environment: - 'KONG_DATABASE=postgres' - 'KONG_PG_HOST=kong-db' + - 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}' - 'KONG_PROXY_ACCESS_LOG=/dev/stdout' - 'KONG_ADMIN_ACCESS_LOG=/dev/stdout' - 'KONG_PROXY_ERROR_LOG=/dev/stderr'