working local and cloud

Author: raphaeltm

samples/rails/.env

@@ -1,4 +1,3 @@
 SECRET_KEY_BASE=example
-DATABASE_USERNAME=postgres
-DATABASE_PASSWORD=secret
-DATABASE_HOST=db
+POSTGRES_USERNAME=postgres
+POSTGRES_HOST=db

samples/rails/app/Dockerfile.dev

@@ -26,6 +26,8 @@ RUN bundle install && \
 # Copy application code
 COPY . .
 
+RUN ls /rails
+
 # Entrypoint prepares the database.
 ENTRYPOINT ["/rails/bin/docker-entrypoint"]
 

samples/rails/app/config/database.yml

@@ -1,9 +1,9 @@
 default: &default
   adapter: postgresql
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  username: <%= ENV["DATABASE_USERNAME"] %>
-  password: <%= ENV["DATABASE_PASSWORD"] %>
-  host: <%= ENV["DATABASE_HOST"] %>
+  username: <%= ENV["POSTGRES_USERNAME"] %>
+  password: <%= ENV["POSTGRES_PASSWORD"] %>
+  host: <%= ENV["POSTGRES_HOST"] %>
   port: 5432
   timeout: 5000
 

samples/rails/compose.dev.yaml

@@ -1,17 +1,19 @@
 services:
-  web:
+  rails:
     extends:
       file: compose.yaml
-      service: web
+      service: rails
     build:
       context: ./app
       dockerfile: Dockerfile.dev
     env_file:
       - .env
+    environment:
+      - POSTGRES_PASSWORD=secret
     ports:
       - "3000:3000"
     volumes:
-      - .:/rails/
+      - ./app:/rails/
 
   db:
     extends:

samples/rails/compose.yaml

@@ -8,6 +8,8 @@ services:
       dockerfile: Dockerfile
     env_file:
       - .env
+    environment:
+      POSTGRES_PASSWORD:
     ports:
       - mode: ingress
         target: 3000
@@ -23,9 +25,9 @@ services:
   db:
     restart: unless-stopped
     image: postgres:16
+    x-defang-postgres: true
     environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: secret
+      POSTGRES_PASSWORD:
     ports:
       - mode: host
         target: 5432