Skip to content
Open
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ config/twitter.yml
.DS_Store
public/assets
coverage/
docker-compose.override.yml
node_modules/
2 changes: 1 addition & 1 deletion app/models/tomato.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Tomato
after_create :increment_score
after_destroy :decrement_score

DURATION = Rails.env.development? ? 25 : 25 * 60 # pomodoro default duration in seconds
DURATION = Rails.env.development? ? ENV.fetch("DURATION", 25).to_i : 25 * 60 # pomodoro default duration in seconds
BREAK_DURATION = Rails.env.development? ? 5 : 5 * 60 # pomodoro default break duration in seconds

include ActionView::Helpers::TextHelper
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/omniauth.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if Rails.env.production?
if ENV.has_key? 'GITHUB_CLIENT_ID'
GITHUB = {
'client_id' => ENV['GITHUB_CLIENT_ID'],
'client_secret' => ENV['GITHUB_CLIENT_SECRET']
Expand Down
8 changes: 6 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
mongo:
image: mongo
image: mongo:4
ports:
- 27017:27017

Expand All @@ -10,10 +10,14 @@ services:
build: .
volumes:
- .:/tomatoes
tmpfs:
- /tomatoes/tmp
entrypoint: ./docker-entrypoint.sh
ports:
- 3000:3000
- 4000:3000
depends_on:
- mongo
environment:
- DO_HOST=mongo
- DURATION=1500
- BREAK_DURATION=300