From 7763251fb75458ebe3c5b2fcee08b32ffc7bf01f Mon Sep 17 00:00:00 2001 From: frederikhors <41120635+frederikhors@users.noreply.github.com> Date: Sun, 23 Feb 2020 21:32:22 +0100 Subject: [PATCH] fix "Try the demo app" in docs (#38) * fix "Try the demo app" in docs * fix "Get Started" setup in docs --- config/dev.yml | 2 +- config/prod.yml | 2 +- docker-compose.yml | 5 ++++- docs/guide.md | 8 +++++++- examples/rails-app/config/database.yml | 2 +- tmpl/dev.yml | 2 +- tmpl/prod.yml | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/config/dev.yml b/config/dev.yml index 34cd332..c60310c 100644 --- a/config/dev.yml +++ b/config/dev.yml @@ -93,7 +93,7 @@ database: port: 5432 dbname: app_development user: postgres - password: '' + password: postgres #schema: "public" #pool_size: 10 diff --git a/config/prod.yml b/config/prod.yml index c4d8169..e53cd7a 100644 --- a/config/prod.yml +++ b/config/prod.yml @@ -54,7 +54,7 @@ database: port: 5432 dbname: app_production user: postgres - password: '' + password: postgres #pool_size: 10 #max_retries: 0 #log_level: "debug" diff --git a/docker-compose.yml b/docker-compose.yml index 3e3dd3b..3dc65b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,12 @@ version: '3.4' services: db: - image: postgres + image: postgres:12 ports: - "5432:5432" + environment: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres # redis: # image: redis:alpine diff --git a/docs/guide.md b/docs/guide.md index 7d8c536..633246f 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -34,6 +34,12 @@ Super Graph has a rich feature set like integrating with your existing Ruby on R # clone the repository git clone https://github.com/dosco/super-graph +# run db in background +docker-compose up -d db + +# see logs and wait until DB is really UP +docker-compose logs db + # setup the demo rails app & database and run it docker-compose run rails_app rake db:create db:migrate db:seed @@ -1767,7 +1773,7 @@ database: port: 5432 dbname: app_development user: postgres - password: '' + password: postgres #schema: "public" #pool_size: 10 diff --git a/examples/rails-app/config/database.yml b/examples/rails-app/config/database.yml index 5ff3ee9..8bacb01 100644 --- a/examples/rails-app/config/database.yml +++ b/examples/rails-app/config/database.yml @@ -19,7 +19,7 @@ default: &default encoding: unicode host: db username: postgres - password: + password: postgres pool: 5 development: diff --git a/tmpl/dev.yml b/tmpl/dev.yml index 68116e9..b3fa213 100644 --- a/tmpl/dev.yml +++ b/tmpl/dev.yml @@ -109,7 +109,7 @@ database: port: 5432 dbname: {% app_name_slug %}_development user: postgres - password: '' + password: postgres #schema: "public" #pool_size: 10 diff --git a/tmpl/prod.yml b/tmpl/prod.yml index 5069c7d..c1e5985 100644 --- a/tmpl/prod.yml +++ b/tmpl/prod.yml @@ -54,7 +54,7 @@ database: port: 5432 dbname: {% app_name_slug %}_development user: postgres - password: '' + password: postgres #pool_size: 10 #max_retries: 0 #log_level: "debug"