Skip to content

Commit

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

pg:
image: postgres:9.3
image: postgres:9.4
environment:
POSTGRES_HOST_AUTH_METHOD: password
POSTGRES_PASSWORD: StrongPass

conjur:
image: cyberark/conjur
command: server -a cucumber -p 3000
environment:
CONJUR_APPLIANCE_URL: http://localhost:3000
DATABASE_URL: postgres://postgres@pg/postgres
DATABASE_URL: postgres://postgres:StrongPass@pg/postgres
CONJUR_DATA_KEY: "W0BuL8iTr/7QvtjIluJbrb5LDAnmXzmcpxkqihO3dXA="
networks:
- default
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 bb7b09f

Please sign in to comment.