From a8f741b9b51811437d90361715006cd73ddec4c4 Mon Sep 17 00:00:00 2001 From: Christoph Marzell Date: Fri, 7 Nov 2025 04:30:51 +0100 Subject: [PATCH] minor setup fixes --- config/database.yml | 1 + docker-compose.yml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/database.yml b/config/database.yml index dcbf846..a3be50d 100644 --- a/config/database.yml +++ b/config/database.yml @@ -86,4 +86,5 @@ production: <<: *default database: praktikum_production username: praktikum + #password: <%= ENV["PRAKTIKUM_DATABASE_PASSWORD"] %> diff --git a/docker-compose.yml b/docker-compose.yml index 62bdb09..13bc958 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,17 +22,18 @@ services: web: build: . restart: unless-stopped - command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -b 0.0.0.0" + command: bash -c "bundle install && rm -f tmp/pids/server.pid && bundle exec rails db:create db:migrate db:seed && bundle exec rails s -p 3000 -b '0.0.0.0'" volumes: - .:/app ports: - - "3000:3000" + - "13131:3000" depends_on: - db environment: - DATABASE_URL: postgres://postgres:password@db:5432/postgres + DATABASE_URL: postgres://praktikum:password@db:35432/postgres RAILS_ENV: production SECRET_KEY_BASE: 5e1494fafd054d854b52661265e64e50d69787e9d4495173606f36fa3e5a685bd0264a41d6e138ea430f24008d5c07bcdf2a62a69de3c1b1cc042f05721432a0 + DB: db networks: - praktikum-network volumes: