Skip to content
This repository was archived by the owner on Feb 24, 2021. It is now read-only.

Fix postgres-db initialization requires a password to start now #219

Merged
merged 5 commits into from
Feb 20, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion releases/fuji/compose-files/docker-compose-fuji.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions releases/nightly-build/compose-files/docker-compose-nexus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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'
Expand Down