From 36c75af23f325892fce5e382e6f5c66944543108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20J=C3=A4ger?= Date: Sun, 7 Jan 2024 14:42:26 +0100 Subject: [PATCH] minor improvements --- docker-compose.yml | 4 ++-- packages/db/setup.sh | 21 ++++++++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a66ee9f61..d1bdacbe3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,9 +24,9 @@ services: command: '/bin/sh ./packages/db/setup.sh' # Also create a demo user with email: demo@omnivore.app, password: demo_password environment: - PGPASSWORD=postgres + - POSTGRES_USER=postgres - PG_HOST=postgres - - PG_USER=postgres - - PG_PASSWORD=postgres + - PG_PASSWORD=app_pass - PG_DB=omnivore depends_on: postgres: diff --git a/packages/db/setup.sh b/packages/db/setup.sh index 0a09d5428..217bc86ad 100755 --- a/packages/db/setup.sh +++ b/packages/db/setup.sh @@ -1,13 +1,20 @@ #!/bin/bash -psql --host $PG_HOST -U $PG_USER -d $PG_DB -c "CREATE USER app_user WITH PASSWORD 'app_pass';" || true +psql --host $PG_HOST --username $POSTGRES_USER --command "CREATE DATABASE $PG_DB;" || true +echo "create $PG_DB database" + +psql --host $PG_HOST --username $POSTGRES_USER --command "CREATE USER app_user WITH ENCRYPTED PASSWORD '$PG_PASSWORD';" || true echo "created app_user" -yarn workspace @omnivore/db migrate -psql --host $PG_HOST -U $PG_USER -d $PG_DB -c "GRANT omnivore_user TO app_user;" || true + +PG_USER=$POSTGRES_USER PG_PASSWORD=$PGPASSWORD yarn workspace @omnivore/db migrate + +psql --host $PG_HOST --username $POSTGRES_USER --dbname $PG_DB --command "GRANT omnivore_user TO app_user;" || true echo "granted omnivore_user to app_user" # create demo user with email: demo@omnivore.app, password: demo_password -USER_ID=$(uuidgen) -PASSWORD='$2a$10$41G6b1BDUdxNjH1QFPJYDOM29EE0C9nTdjD1FoseuQ8vZU1NWtrh6' -psql --host $PG_HOST -U $PG_USER -d $PG_DB -c "INSERT INTO omnivore.user (id, source, email, source_user_id, name, password) VALUES ('$USER_ID', 'EMAIL', 'demo@omnivore.app', 'demo@omnivore.app', 'Demo User', '$PASSWORD'); INSERT INTO omnivore.user_profile (user_id, username) VALUES ('$USER_ID', 'demo_user');" -echo "created demo user with email: demo@omnivore.app, password: demo_password" +if [ -z "${NO_DEMO_USER}" ]; then + USER_ID=$(uuidgen) + PASSWORD='$2a$10$41G6b1BDUdxNjH1QFPJYDOM29EE0C9nTdjD1FoseuQ8vZU1NWtrh6' + psql --host $PG_HOST --username $POSTGRES_USER --dbname $PG_DB --command "INSERT INTO omnivore.user (id, source, email, source_user_id, name, password) VALUES ('$USER_ID', 'EMAIL', 'demo@omnivore.app', 'demo@omnivore.app', 'Demo User', '$PASSWORD'); INSERT INTO omnivore.user_profile (user_id, username) VALUES ('$USER_ID', 'demo_user');" + echo "created demo user with email: demo@omnivore.app, password: demo_password" +fi \ No newline at end of file