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

refactor docker file, fixes filter bug [fixes OSRA-468] #456

Open
wants to merge 74 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
f6bb7bd
Update all to pessemistic versions
NikitaAvvakumov Nov 26, 2016
10f9f89
WIP
NikitaAvvakumov Nov 26, 2016
73e5a07
WIP
NikitaAvvakumov Nov 26, 2016
0ac5ce7
Restore version lock on roo
NikitaAvvakumov Nov 26, 2016
35c6930
WIP
NikitaAvvakumov Nov 26, 2016
649e1bd
WIP: done with low-hanging fruit
NikitaAvvakumov Nov 26, 2016
8111801
Update roo & add roo-xls
NikitaAvvakumov Nov 26, 2016
c153230
Replace rails_config with config
NikitaAvvakumov Nov 26, 2016
ac7c436
Wreck the test suite by updating Capybara & shoulda-matchers
NikitaAvvakumov Nov 26, 2016
60ab937
add assets
b264 Dec 11, 2016
9236eca
add assets
b264 Dec 11, 2016
9e90530
add branding
b264 Dec 11, 2016
6384936
scale apple-touch-icon
b264 Dec 12, 2016
2b9a52b
Add order to sponsor scopes
Maroo-b Dec 12, 2016
00a1011
Merge pull request #440 from Maroo-b/osra-461_add_order_to_sponsors_s…
b264 Dec 17, 2016
893df99
Merge pull request #438 from b264/0branding
NikitaAvvakumov Dec 17, 2016
b2030fa
add halalas spec
b264 Dec 11, 2016
954c01e
add halalas helper
b264 Dec 12, 2016
e44e225
add Payment spec
b264 Dec 12, 2016
3b20e55
add Payment model
b264 Dec 12, 2016
6d3d124
change SAR currency symbol
b264 Dec 12, 2016
86b3eb8
refactor Halalas
b264 Dec 18, 2016
0b01400
refactor Halala
b264 Dec 18, 2016
0b60552
prune redundant spec
b264 Dec 18, 2016
90f1416
privatise riyal
b264 Dec 19, 2016
c8a389f
refactor Halala
b264 Dec 30, 2016
9bbdac9
Merge pull request #439 from b264/452_payments
b264 Dec 30, 2016
c18d677
Add cashbox model
Maroo-b Jan 3, 2017
57e21d3
add schema file
Maroo-b Jan 3, 2017
a2ad90e
Add test for cashbox model
Maroo-b Jan 4, 2017
78a2b8b
change factory generator for balance
Maroo-b Jan 6, 2017
0a69c3d
remove balance from cashbox model
Maroo-b Jan 8, 2017
f9e3971
Add validation to Payment amount value
Maroo-b Jan 8, 2017
7fc18e5
Replace faker with factory-helper
NikitaAvvakumov Jan 8, 2017
053f018
Include shoulda_matchers config
NikitaAvvakumov Jan 8, 2017
c3644a8
Fix organization & user specs
NikitaAvvakumov Jan 8, 2017
047466a
Merge pull request #441 from Maroo-b/osra-451_create_cashbox_model
b264 Jan 8, 2017
fee3cd7
Get test suite back to green, resolve Devise deprecation warnings
NikitaAvvakumov Jan 8, 2017
2b59346
Create method to make payments into sponsor's cashbox
Maroo-b Jan 9, 2017
f3741bb
add service object for creating funds
Maroo-b Jan 9, 2017
3812d8c
add validation to CreateFunds service
Maroo-b Jan 9, 2017
6332479
add missing test cases
Maroo-b Jan 11, 2017
b4d4a69
refactor CreateFunds service
Maroo-b Jan 11, 2017
654a2c0
WIP: Fixing Capybara deprecations & spec errors
NikitaAvvakumov Jan 11, 2017
70eca84
Fix broken Capybara specs
NikitaAvvakumov Jan 12, 2017
b798e26
Revert to instantiate payment instead of create
Maroo-b Jan 12, 2017
a561b80
improve test for cashbox total method
Maroo-b Jan 13, 2017
df2bfc0
Update country_select, others; fix specs
NikitaAvvakumov Jan 15, 2017
1f491cb
Update production gems
NikitaAvvakumov Jan 15, 2017
4fca421
Update AWS S3 settings for paperclip
NikitaAvvakumov Jan 15, 2017
16a5ec4
Fix dumb error with S3 config
NikitaAvvakumov Jan 15, 2017
39339e5
Merge upstread/develop into update-dependencies
NikitaAvvakumov Jan 15, 2017
01572ab
Alphabetize
NikitaAvvakumov Jan 15, 2017
3213cdd
refactor CreateFunds service
Maroo-b Jan 16, 2017
d221350
refactor sponsorship callback
b264 Jan 18, 2017
e5dc1e6
remove ambiguous validator; using DateNotBeyondFirstOfNextMonthValidator
b264 Jan 18, 2017
4e298af
Merge pull request #447 from b264/0coverage
b264 Jan 18, 2017
1430d68
Merge pull request #445 from Maroo-b/osra-453_add_payment_to_sponsor_cb
b264 Feb 14, 2017
473c9b0
Merge pull request #446 from NikitaAvvakumov/update-dependencies
b264 Feb 14, 2017
a7b11e4
Merge branch '450_track_payments' into develop
b264 Feb 19, 2017
d58206d
Fix S3 credentials configuration for Paperclip
NikitaAvvakumov Mar 19, 2017
6208036
Set Paperclip S3 host based on ENV
NikitaAvvakumov Mar 19, 2017
7b71cf9
Improve Paperclip initializer
NikitaAvvakumov Mar 19, 2017
5aa39d3
Merge pull request #451 from NikitaAvvakumov/fix-paperclip-s3-config
NikitaAvvakumov Mar 19, 2017
8741234
Replace s3_host_domain config with url & path config for Paperclip
NikitaAvvakumov Mar 19, 2017
bdb6377
TEST: Change Paperclip path
NikitaAvvakumov Mar 19, 2017
8b4045c
Configure Paperclip path to use public/system in test env
NikitaAvvakumov Mar 19, 2017
fa50e3f
Try to make Semaphore happy
NikitaAvvakumov Mar 19, 2017
0b6b45c
Merge pull request #452 from NikitaAvvakumov/wip
NikitaAvvakumov Mar 19, 2017
220a916
Use public/system for Paperclip except in production
NikitaAvvakumov Mar 21, 2017
a113297
dockerize app
ZmagoD May 25, 2017
ac12cc8
Merge pull request #455 from ZmagoD/dockerize
b264 May 26, 2017
6415b1e
refactor docker file, fixes filter bug [fixes OSRA-468]
ZmagoD Jun 5, 2017
1654279
refactor
ZmagoD Jun 9, 2017
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
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.git
.dockerignore
.byebug_history
/log/*
/tmp/*
13 changes: 13 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM ruby:2.2.0
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
ENV PHANTOMJS_VERSION=1.9.8
RUN cd /usr/local/share
RUN wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-${PHANTOMJS_VERSION}-linux-x86_64.tar.bz2
RUN tar xvf phantomjs-${PHANTOMJS_VERSION}-linux-x86_64.tar.bz2
RUN ln -sf /usr/local/share/phantomjs-${PHANTOMJS_VERSION}-linux-x86_64/bin/phantomjs /usr/local/bin
RUN mkdir /osra
WORKDIR /osra
ADD Gemfile /osra/Gemfile
ADD Gemfile.lock /osra/Gemfile.lock
RUN bundle install
ADD . /osra
81 changes: 42 additions & 39 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,51 +1,54 @@
source 'https://rubygems.org'
source "https://rubygems.org"

ruby '2.2.0'
ruby "2.2.0"

gem 'rails', '~> 4.2.7'
gem "rails", "~> 4.2.7"

gem 'pg', '~> 0.18.1' # Ruby interface to PostgreSQL
gem 'sass-rails', '~> 5.0.0' # use SASS instead of CSS
gem 'bootstrap-sass', '~> 3.3.3' # sass powered version of bootstrap
gem 'bootstrap-datepicker-rails', '~> 1.3.1' # bootstrap datepicker
gem 'autoprefixer-rails', '~> 6.5.1' # auto add vendor prefixes to CSS rules
gem 'coffee-rails', '~> 4.1.0' # use Coffeescript
gem 'uglifier', '~> 3.0.3' # compressor for JavaScript assets
gem 'sequenced', '>= 2.0.0' # sequential IDs in Models
gem 'devise', '~> 3.5.10' # authentication solution
gem 'jquery-rails', '~> 4.2.1' # use jquery with Rails
gem 'paperclip', '~> 4.2.1' # upload attachment files
gem 'aws-sdk', '< 2.0' # Amazon Web Services - S3 bucket for Paperclip;
# as of 07-04-2015, paperclip is not yet compatible with aws-sdk v2.0
gem 'coveralls', '~> 0.7.9', require: false # measure test coverage
gem 'country_select', github: 'stefanpenner/country_select' # country drop-down
gem 'roo', '~> 1.13.2' # access contents of spreadsheet files
gem 'rails_config', '~> 0.4.2' # TODO: consider removing after importer settings refactored
gem 'newrelic_rpm', '~> 3.10.0' # application monitoring on Heroku
gem 'haml', '~> 4.0.6' # [view] templating engine
gem 'will_paginate', '~> 3.0.7' # pagination gem for rails branch
gem 'will_paginate-bootstrap', '~> 1.0.1' # bootstrap integration with will_paginate
gem "autoprefixer-rails" # auto add vendor prefixes to CSS rules
gem "aws-sdk" # Amazon Web Services - S3 bucket for Paperclip;
gem "bootstrap-datepicker-rails" # bootstrap datepicker
gem "bootstrap-sass" # sass powered version of bootstrap
gem "coffee-rails" # use Coffeescript
gem "config" # TODO: consider removing after importer settings refactored
gem "country_select" # country drop-down
gem "coveralls", require: false # measure test coverage
gem "devise" # authentication solution
gem "haml" # [view] templating engine
gem "jquery-rails" # use jquery with Rails
gem "newrelic_rpm" # application monitoring on Heroku
gem "paperclip" # upload attachment files
gem "pg" # Ruby interface to PostgreSQL
gem "roo" # access contents of spreadsheet files
gem "roo-xls" # extend roo to handle legacy xls files
gem "sass-rails" # use SASS instead of CSS
gem "sequenced" # sequential IDs in Models
gem "uglifier" # compressor for JavaScript assets
gem "will_paginate" # pagination gem for rails branch
gem "will_paginate-bootstrap" # bootstrap integration with will_paginate

group :test do
gem 'capybara', '~> 2.4.4' # interact with pages in tests
gem 'shoulda-matchers', '~> 2.8', require: false # one-line tests for common Rails validations
gem "capybara" # interact with pages in tests
gem "shoulda-matchers" # one-line tests for common Rails validations
end

group :development, :test do
gem 'rspec-rails', '~> 3.5' # RSpec test framework for Rails
gem 'faker', '~> 1.4.3' # easily generate fake data
gem 'factory_girl_rails', '~> 4.5.0' # use factories to produce objects
gem 'awesome_print', '~> 1.6.1' # Well Formatted output in console
gem 'pry-byebug', '~> 3.0.1' # a version of pry and debugger compatible with Ruby >2.0.0
gem 'hirb', '~> 0.7.3' # formats ActiveRecord objects into table format in the console
gem 'pry-rails', '~> 0.3.3' # integrate pry with rails console
gem 'better_errors', '~> 2.1.1' # nice output of rails errors in browser
gem 'binding_of_caller', '~> 0.7.2' # online console and debugging in browser
gem 'launchy', '~> 2.4.3' # open capybara-generated pages in browser
gem 'web-console', '~> 2.0.0' # debuggin tools for Rails
gem "awesome_print" # Well Formatted output in console
gem "better_errors" # nice output of rails errors in browser
gem "binding_of_caller" # online console and debugging in browser
gem "factory-helper" # easily generate fake data
gem "factory_girl_rails" # use factories to produce objects
gem "hirb" # formats ActiveRecord objects into table format in the console
gem "launchy" # open capybara-generated pages in browser
gem "pry-byebug" # a version of pry and debugger compatible with Ruby >2.0.0
gem "pry-rails" # integrate pry with rails console
gem "rspec-rails" # RSpec test framework for Rails
end

group :development do
gem "web-console" # debugging tools for Rails
end

group :production do
gem 'rails_12factor', '~> 0.0.3' # required to run the app on Heroku
gem 'passenger', '~> 4.0.59' # web server
gem "rails_12factor" # required to run the app on Heroku
gem "passenger" # web server
end
Loading