Skip to content

Commit

Permalink
Pushes ruby to 2.6.10 to be able to install on modern hardware, updat…
Browse files Browse the repository at this point in the history
…es dependencies as well
  • Loading branch information
toomuchpete committed Mar 21, 2024
1 parent f76f79d commit 6e8406b
Show file tree
Hide file tree
Showing 11 changed files with 132 additions and 119 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.1
ruby-2.6.10
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.3
FROM ruby:2.6.10
MAINTAINER Pete Holiday <pete.holiday@gmail.com>

RUN mkdir -p /var/app
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.3
FROM ruby:2.6.10
MAINTAINER Pete Holiday <pete.holiday@gmail.com>

RUN mkdir -p /var/app
Expand Down
92 changes: 45 additions & 47 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,44 +5,42 @@ gem 'rails', '~> 3.2.22'
gem 'mimemagic', git: 'https://github.com/mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f'

# Backend
# gem 'airbrake'
# gem 'newrelic_rpm'
gem 'json'
gem 'multi_json'
gem 'mongoid'
gem 'declarative_authorization'
gem 'mongoid-paperclip', require: 'mongoid_paperclip'
gem 'strong_parameters'
gem 'ruby_parser'
gem 'smarter_csv'
gem 'actionmailer'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'dalli'
gem 'premailer-rails'
gem 'nokogiri'
gem 'braintree'
gem 'json', '~> 1.8.6'
gem 'multi_json', '~> 1.15.0'
gem 'mongoid', '~> 3.1.7'
gem 'declarative_authorization', '~> 0.5.7'
gem 'mongoid-paperclip', '~> 0.0.11', require: 'mongoid_paperclip'
gem 'strong_parameters', '~> 0.2.1'
gem 'ruby_parser', '~> 3.2.2'
gem 'smarter_csv', '~> 1.0.17'
gem 'actionmailer', '~> 3.2.22.5'
gem 'bcrypt-ruby', '~> 3.0.1'
gem 'dalli', '~> 2.7.6'
gem 'premailer-rails', '~> 1.12'
gem 'nokogiri', '~> 1.9.1'
gem 'braintree', '~> 2.101.0'
gem 'twilio-ruby', '~> 5.10.7'
gem 'puma'
gem 'bugsnag'
gem 'puma', '~> 6.4.2'
gem 'bugsnag', '~> 5.1.0'
gem 'test-unit', '~> 3.0'
gem 'gibbon', '~> 3.0'

# Job Processing
gem 'sidekiq'
gem 'sidekiq-cron'
gem 'sidekiq', '~> 4.2.9'
gem 'sidekiq-cron', '~> 0.4.5'
gem 'kiqstand', '~> 1.1.0'
gem 'sinatra', require: false
gem 'slim'
gem 'whenever'
gem 'sinatra', '~> 1.4.4', require: false
gem 'slim', '~> 2.0.2'
gem 'whenever', '~> 0.9.4'

# Frontend
gem 'active_link_to'
gem 'bootstrap-sass'
gem 'bootstrap-will_paginate'
gem 'bootstrap_form'
gem 'haml'
gem 'jquery-rails'
gem 'will_paginate'
gem 'active_link_to', '~> 1.0.0'
gem 'bootstrap-sass', '~> 2.3.1.0'
gem 'bootstrap-will_paginate', '~> 1.0.0'
gem 'bootstrap_form', '~> 0.3.2'
gem 'haml', '~> 4.0.1'
gem 'jquery-rails', '~> 2.2.1'
gem 'will_paginate', '~> 3.1.6'
gem "font-awesome-rails", '~> 3.2.1.0'


Expand All @@ -52,35 +50,35 @@ group :assets do
gem 'sass-rails', '~> 3.2.3'
# gem 'coffee-rails', '~> 3.2.1'
# gem 'uglifier', '>= 1.0.3'
gem 'mini_racer'
gem 'mini_racer', '~> 0.6.4'
end

group :development, :test do
gem 'faker'
gem 'guard-rspec'
gem 'guard-spork'
gem 'rspec-rails'
gem 'better_errors'
gem 'binding_of_caller'
gem 'faker', '~> 1.1.2'
gem 'guard-rspec', '~> 2.5.1'
gem 'guard-spork', '~> 1.5.0'
gem 'rspec-rails', '~> 2.13.1'
gem 'better_errors', '~> 1.1.0'
gem 'binding_of_caller', '~> 1.0.0'
end

group :development do
gem 'annotate'
gem 'haml-rails'
gem 'rb-inotify', require: false
gem 'rb-fsevent', require: false
gem 'rb-fchange', require: false
gem 'terminal-notifier-guard'
gem 'thin'
gem 'annotate', '~> 2.5.0'
gem 'haml-rails', '~> 0.4'
gem 'rb-inotify', '~> 0.9.0', require: false
gem 'rb-fsevent', '~> 0.9.3', require: false
gem 'rb-fchange', '~> 0.0.6', require: false
gem 'terminal-notifier-guard', '~> 1.5.3'
gem 'thin', '~> 1.8.2'
end

group :test do
gem 'factory_girl_rails'
gem 'spork'
gem 'factory_girl_rails', '~> 4.2.1'
gem 'spork', '~> 0.9.2'
end

group :ops do
gem 'pry'
gem 'pry', '~> 0.9.12'
end

# To use ActiveModel has_secure_password
Expand Down
143 changes: 77 additions & 66 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ GEM
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
annotate (2.5.0)
rake
arel (3.0.3)
Expand All @@ -62,17 +63,17 @@ GEM
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coderay (1.0.9)
concurrent-ruby (1.1.9)
concurrent-ruby (1.2.3)
connection_pool (2.2.1)
css_parser (1.3.5)
css_parser (1.12.0)
addressable
daemons (1.1.9)
dalli (2.7.0)
daemons (1.4.1)
dalli (2.7.11)
debug_inspector (1.1.0)
declarative_authorization (0.5.7)
diff-lcs (1.3)
erubis (2.7.0)
eventmachine (1.0.4)
eventmachine (1.2.7)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
Expand All @@ -82,7 +83,7 @@ GEM
i18n (~> 0.5)
faraday (0.17.6)
multipart-post (>= 1.2, < 3)
ffi (1.6.0)
ffi (1.16.3)
font-awesome-rails (3.2.1.3)
railties (>= 3.2, < 5.0)
formatador (0.2.4)
Expand Down Expand Up @@ -110,7 +111,7 @@ GEM
haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1)
hike (1.2.3)
htmlentities (4.3.1)
htmlentities (4.3.4)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
Expand All @@ -122,7 +123,7 @@ GEM
kiqstand (1.1.0)
mongoid (~> 3.1)
moped (~> 1.4)
libv8-node (15.14.0.1)
libv8-node (16.19.0.1)
listen (0.7.3)
lumberjack (1.0.3)
mail (2.5.5)
Expand All @@ -131,8 +132,8 @@ GEM
method_source (0.8.1)
mime-types (1.25.1)
mini_portile2 (2.4.0)
mini_racer (0.4.0)
libv8-node (~> 15.14.0.0)
mini_racer (0.6.4)
libv8-node (~> 16.19.0.0)
mongoid (3.1.7)
activemodel (~> 3.2)
moped (~> 1.4)
Expand All @@ -144,6 +145,11 @@ GEM
moped (1.5.3)
multi_json (1.15.0)
multipart-post (2.2.0)
net-protocol (0.2.2)
timeout
net-smtp (0.4.0.1)
net-protocol
nio4r (2.7.1)
nokogiri (1.9.1)
mini_portile2 (~> 2.4.0)
origin (1.1.0)
Expand All @@ -154,19 +160,23 @@ GEM
mime-types
polyglot (0.3.5)
power_assert (2.0.3)
premailer (1.8.0)
css_parser (>= 1.3.5)
premailer (1.15.0)
addressable
css_parser (>= 1.6.0)
htmlentities (>= 4.0.0)
premailer-rails (1.6.1)
actionmailer (>= 3, < 5)
premailer-rails (1.12.0)
actionmailer (>= 3)
net-smtp
premailer (~> 1.7, >= 1.7.9)
pry (0.9.12)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
puma (3.6.2)
public_suffix (5.0.4)
puma (6.4.2)
nio4r (~> 2.0)
rack (1.4.7)
rack-cache (1.7.1)
rack-cache (1.15.0)
rack (>= 0.4)
rack-protection (1.5.3)
rack
Expand Down Expand Up @@ -257,12 +267,13 @@ GEM
terminal-notifier-guard (1.5.3)
test-unit (3.6.1)
power_assert
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thin (1.8.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (0.20.0)
tilt (1.4.1)
timeout (0.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
Expand All @@ -279,59 +290,59 @@ PLATFORMS
ruby

DEPENDENCIES
actionmailer
active_link_to
annotate
bcrypt-ruby (~> 3.0.0)
better_errors
binding_of_caller
bootstrap-sass
bootstrap-will_paginate
bootstrap_form
braintree
bugsnag
dalli
declarative_authorization
factory_girl_rails
faker
actionmailer (~> 3.2.22.5)
active_link_to (~> 1.0.0)
annotate (~> 2.5.0)
bcrypt-ruby (~> 3.0.1)
better_errors (~> 1.1.0)
binding_of_caller (~> 1.0.0)
bootstrap-sass (~> 2.3.1.0)
bootstrap-will_paginate (~> 1.0.0)
bootstrap_form (~> 0.3.2)
braintree (~> 2.101.0)
bugsnag (~> 5.1.0)
dalli (~> 2.7.6)
declarative_authorization (~> 0.5.7)
factory_girl_rails (~> 4.2.1)
faker (~> 1.1.2)
font-awesome-rails (~> 3.2.1.0)
gibbon (~> 3.0)
guard-rspec
guard-spork
haml
haml-rails
jquery-rails
json
guard-rspec (~> 2.5.1)
guard-spork (~> 1.5.0)
haml (~> 4.0.1)
haml-rails (~> 0.4)
jquery-rails (~> 2.2.1)
json (~> 1.8.6)
kiqstand (~> 1.1.0)
mimemagic!
mini_racer
mongoid
mongoid-paperclip
multi_json
nokogiri
premailer-rails
pry
puma
mini_racer (~> 0.6.4)
mongoid (~> 3.1.7)
mongoid-paperclip (~> 0.0.11)
multi_json (~> 1.15.0)
nokogiri (~> 1.9.1)
premailer-rails (~> 1.12)
pry (~> 0.9.12)
puma (~> 6.4.2)
rails (~> 3.2.22)
rb-fchange
rb-fsevent
rb-inotify
rspec-rails
ruby_parser
rb-fchange (~> 0.0.6)
rb-fsevent (~> 0.9.3)
rb-inotify (~> 0.9.0)
rspec-rails (~> 2.13.1)
ruby_parser (~> 3.2.2)
sass-rails (~> 3.2.3)
sidekiq
sidekiq-cron
sinatra
slim
smarter_csv
spork
strong_parameters
terminal-notifier-guard
sidekiq (~> 4.2.9)
sidekiq-cron (~> 0.4.5)
sinatra (~> 1.4.4)
slim (~> 2.0.2)
smarter_csv (~> 1.0.17)
spork (~> 0.9.2)
strong_parameters (~> 0.2.1)
terminal-notifier-guard (~> 1.5.3)
test-unit (~> 3.0)
thin
thin (~> 1.8.2)
twilio-ruby (~> 5.10.7)
whenever
will_paginate
whenever (~> 0.9.4)
will_paginate (~> 3.1.6)

BUNDLED WITH
1.17.3
4 changes: 2 additions & 2 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
config.assets.debug = true

config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = { address: 'mailhog', port: 1025 }
config.action_mailer.smtp_settings = { address: 'localhost', port: 1025 }

config.cache_store = :dalli_store, 'memcached', { :namespace => 'platinum', :expires_in => 1.day, :compress => true }
config.action_mailer.default_url_options = { :host => "localhost:3000" }
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
end
2 changes: 1 addition & 1 deletion config/mongoid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ development:
# Provides the hosts the default session can connect to. Must be an array
# of host:port pairs. (required)
hosts:
- mongodb:27017
- localhost:27017
options:
# Change whether the session persists in safe mode by default.
# (default: false)
Expand Down
Empty file modified mongo_import/download_backup.sh
100644 → 100755
Empty file.
Loading

0 comments on commit 6e8406b

Please sign in to comment.