Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the development setup #1052

Merged
merged 4 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ development: &default
min_messages: WARNING
pool: 5
username: postgres
host: <%= ENV["POSTGRES_PORT_5432_TCP_ADDR"] || 'localhost' %>
password: <%= ENV["POSTGRES_PASSWORD"] || "INSECURE_LOCAL_DEVELOPMENT_PASSWORD" %>
host: <%= ENV["POSTGRES_PORT_5432_TCP_ADDR"] || '127.0.0.1' %>
port: <%= ENV["POSTGRES_PORT_5432_TCP_PORT"] || 5432 %>

test:
<<: *default
database: onruby_test

production:
url: <%= ENV["DATABASE_URL"] %>
url: <%= ENV["DATABASE_URL"] %>
pool: <%= ENV["DB_POOL"] || ENV["MAX_THREADS"] || 5 %>
encoding: utf8
encoding: utf8
23 changes: 7 additions & 16 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
postgres:
image: postgres:9.4.1
box:
image: busybox
volumes:
- /box
web:
build: .
ports:
- "3000:3000"
links:
- postgres
volumes:
- .:/app
volumes_from:
- box
services:
postgres:
image: postgres:14.12
ports:
- "5432:5432"
environment:
POSTGRES_PASSWORD: INSECURE_LOCAL_DEVELOPMENT_PASSWORD
9 changes: 9 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,15 @@ This will list links and logos to all the usergroups.

### Install locally

### On a Docker Container

```sh
docker-compose up postgres -d

./bin/setup
./bin/rails server
```

### On your machine

#### Install PostgreSQL
Expand Down
Loading