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

Make it buildable by locking the version of Ruby, Bundler, ActiveModel, ActiveRecord, ActiveSupport #57

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
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
6 changes: 3 additions & 3 deletions Dockerfile.development
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ RUN apt-add-repository ppa:brightbox/ruby-ng
RUN apt-get update
RUN apt-get upgrade -y
RUN apt-get install -y nodejs \
ruby2.1 \
ruby2.1-dev \
ruby2.3 \
ruby2.3-dev \
build-essential \
curl \
zlib1g-dev \
Expand All @@ -30,7 +30,7 @@ RUN apt-get install -y nodejs \
imagemagick \
wkhtmltopdf

RUN gem install bundler
RUN gem install bundler -v 1.17.3

ENV APP_HOME /share
RUN mkdir $APP_HOME
Expand Down
12 changes: 11 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.0.3'
#gem 'rails', '4.0.3'
gem 'rails', '4.0.13'

# Use mysql as the database for Active Record
gem 'mysql2', '0.3.21'
Expand Down Expand Up @@ -33,6 +34,10 @@ group :doc do
gem 'sdoc', require: false
end

gem 'activemodel', '= 4.0.13'
gem 'activerecord', '= 4.0.13'
gem 'activesupport', '= 4.0.13'

# Use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.1.2'

Expand Down Expand Up @@ -69,3 +74,8 @@ gem 'doorkeeper', '1.1.0'
gem "omniauth-oauth2"#, '1.0.2'
#gem 'omniauth-fluxapp' , :path => '/home/tp/Desktop/flux'
gem 'omniauth-fluxapp' , :git => 'https://github.com/stpnlr/omniauth-fluxapp.git'
group :production do
gem 'puma'
gem 'pg'
gem 'rails_12factor'
end
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: '2'
services:
fluxday-db:
docker-fluxday-db:
container_name: fluxday-db
image: mysql
image: mysql:5.6
env_file:
- db.env

fluxday-app:
docker-fluxday-app:
container_name: fluxday-app
tty: true
stdin_open: true
Expand Down