specify db default

shishi · shishi · commit 36e125acb662 · 2021-07-10T15:20:49.000+09:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     services:
-      postgres:
+      db:
         image: postgres:10.4-alpine
         env:
           POSTGRES_USER: postgres
diff --git a/config/database.yml b/config/database.yml
@@ -20,10 +20,10 @@ default: &default
   # For details on connection pooling, see Rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  username: <%= ENV.fetch('DATABASE_USER') { '' } %>
-  password: <%= ENV.fetch('DATABASE_PASSWORD') { '' } %>
-  host: <%= ENV.fetch('DATABASE_HOST') { '' } %>
-  port: <%= ENV.fetch('DATABASE_PORT') { '' } %>
+  username: <%= ENV.fetch('DATABASE_USER') { 'postgres' } %>
+  password: <%= ENV.fetch('DATABASE_PASSWORD') { 'password' } %>
+  host: <%= ENV.fetch('DATABASE_HOST') { 'db' } %>
+  port: <%= ENV.fetch('DATABASE_PORT') { '5432' } %>
 
 development:
   <<: *default
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     depends_on:
       - db
   db:
-    image: "postgres:10.4"
+    image: "postgres:10.4-alpine"
     environment:
       - "POSTGRES_USER=postgres"
       - "POSTGRES_PASSWORD=password"
