minor improvements
This commit is contained in:
@ -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:
|
||||
|
||||
@ -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
|
||||
Reference in New Issue
Block a user