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

Commit 3cf862b

Browse files
authored
Merge pull request #219 from hutchic/fix/kong-db-password
Fix postgres-db initialization requires a password to start now
2 parents ca39ff2 + ad52e22 commit 3cf862b

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

releases/fuji/compose-files/docker-compose-fuji.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ services:
150150
environment:
151151
- 'POSTGRES_DB=kong'
152152
- 'POSTGRES_USER=kong'
153-
153+
- 'POSTGRES_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}'
154154
kong-migrations:
155155
image: kong:1.3.0
156156
container_name: kong-migrations
@@ -161,6 +161,7 @@ services:
161161
environment:
162162
- 'KONG_DATABASE=postgres'
163163
- 'KONG_PG_HOST=kong-db'
164+
- 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}'
164165
command: >
165166
/bin/sh -cx
166167
'until /consul/scripts/consul-svc-healthy.sh kong-db;
@@ -194,6 +195,7 @@ services:
194195
environment:
195196
- 'KONG_DATABASE=postgres'
196197
- 'KONG_PG_HOST=kong-db'
198+
- 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}'
197199
- 'KONG_PROXY_ACCESS_LOG=/dev/stdout'
198200
- 'KONG_ADMIN_ACCESS_LOG=/dev/stdout'
199201
- 'KONG_PROXY_ERROR_LOG=/dev/stderr'

releases/nightly-build/compose-files/docker-compose-nexus-arm64.yml

+3
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ services:
166166
environment:
167167
- 'POSTGRES_DB=kong'
168168
- 'POSTGRES_USER=kong'
169+
- 'POSTGRES_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}'
169170

170171
kong-migrations:
171172
image: kong:1.3.0-ubuntu
@@ -177,6 +178,7 @@ services:
177178
environment:
178179
- 'KONG_DATABASE=postgres'
179180
- 'KONG_PG_HOST=kong-db'
181+
- 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}'
180182
command: >
181183
/bin/sh -cx
182184
'until /consul/scripts/consul-svc-healthy.sh kong-db;
@@ -211,6 +213,7 @@ services:
211213
environment:
212214
- 'KONG_DATABASE=postgres'
213215
- 'KONG_PG_HOST=kong-db'
216+
- 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}'
214217
- 'KONG_PROXY_ACCESS_LOG=/dev/stdout'
215218
- 'KONG_ADMIN_ACCESS_LOG=/dev/stdout'
216219
- 'KONG_PROXY_ERROR_LOG=/dev/stderr'

releases/nightly-build/compose-files/docker-compose-nexus.yml

+3
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ services:
166166
environment:
167167
- 'POSTGRES_DB=kong'
168168
- 'POSTGRES_USER=kong'
169+
- 'POSTGRES_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}'
169170

170171
kong-migrations:
171172
image: kong:1.3.0
@@ -177,6 +178,7 @@ services:
177178
environment:
178179
- 'KONG_DATABASE=postgres'
179180
- 'KONG_PG_HOST=kong-db'
181+
- 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}'
180182
command: >
181183
/bin/sh -cx
182184
'until /consul/scripts/consul-svc-healthy.sh kong-db;
@@ -211,6 +213,7 @@ services:
211213
environment:
212214
- 'KONG_DATABASE=postgres'
213215
- 'KONG_PG_HOST=kong-db'
216+
- 'KONG_PG_PASSWORD=${KONG_POSTGRES_PASSWORD:-kong}'
214217
- 'KONG_PROXY_ACCESS_LOG=/dev/stdout'
215218
- 'KONG_ADMIN_ACCESS_LOG=/dev/stdout'
216219
- 'KONG_PROXY_ERROR_LOG=/dev/stderr'

0 commit comments

Comments
 (0)