From 75f84ea49b385df3086cafc3d0c50395a04b8fbb Mon Sep 17 00:00:00 2001 From: Chris Hoffman Date: Tue, 31 Oct 2023 23:55:21 -0400 Subject: [PATCH 1/3] downgrade mongo so e.g., OP_QUERY errors go away --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6b9ee06..35f15d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: mongo: - image: mongo + image: mongo:4 ports: - 27017:27017 From cd686c2e742dedd8851c4e78cd28c0a941274fdf Mon Sep 17 00:00:00 2001 From: Chris Hoffman Date: Tue, 31 Oct 2023 23:55:49 -0400 Subject: [PATCH 2/3] use tmpfs for tmp so pids goes away --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 35f15d5..cb1688b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,8 @@ services: build: . volumes: - .:/tomatoes + tmpfs: + - /tomatoes/tmp entrypoint: ./docker-entrypoint.sh ports: - 3000:3000 From 810dfc57bcca9df3f5486477347d69855b8c4c3c Mon Sep 17 00:00:00 2001 From: Chris Hoffman Date: Tue, 14 Nov 2023 13:30:47 -0500 Subject: [PATCH 3/3] fixes --- .gitignore | 2 ++ app/models/tomato.rb | 2 +- config/initializers/omniauth.rb | 2 +- docker-compose.yml | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5137135..cecd43c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ config/twitter.yml .DS_Store public/assets coverage/ +docker-compose.override.yml +node_modules/ diff --git a/app/models/tomato.rb b/app/models/tomato.rb index 17a3200..37ab252 100644 --- a/app/models/tomato.rb +++ b/app/models/tomato.rb @@ -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 diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 4610d06..2f4f85a 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -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'] diff --git a/docker-compose.yml b/docker-compose.yml index cb1688b..277877d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,8 +14,10 @@ services: - /tomatoes/tmp entrypoint: ./docker-entrypoint.sh ports: - - 3000:3000 + - 4000:3000 depends_on: - mongo environment: - DO_HOST=mongo + - DURATION=1500 + - BREAK_DURATION=300