Skip to content

Commit

Permalink
Upgrade Postgres to v15
Browse files Browse the repository at this point in the history
  • Loading branch information
john-odonnell committed Sep 15, 2023
1 parent 2b969a1 commit 1eb86f0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
13 changes: 12 additions & 1 deletion dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,18 @@ services:
- /var/run/docker.sock:/var/run/docker.sock

pg:
image: postgres:9.3
image: postgres:15
environment:
# To avoid the following error:
#
# Error: Database is uninitialized and superuser password is not
# specified. You must specify POSTGRES_PASSWORD for the superuser. Use
# "-e POSTGRES_PASSWORD=password" to set it in "docker run".
#
# You may also use POSTGRES_HOST_AUTH_METHOD=trust to allow all
# connections without a password. This is *not* recommended. See
# PostgreSQL documentation about "trust"
POSTGRES_HOST_AUTH_METHOD: trust

conjur:
image: cyberark/conjur
Expand Down
3 changes: 3 additions & 0 deletions dev/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ function clean {
trap clean ERR

function dump {
cd "$(dev_dir)"
echo "---- dumping Conjur logs ----"
docker logs "$(conjur_cid)"
echo "---- dumping Postgres logs ----"
docker-compose logs pg
}
trap dump EXIT

Expand Down

0 comments on commit 1eb86f0

Please sign in to comment.