Skip to content

Commit

Permalink
Merge pull request #513 from CenturyLinkLabs/no-rubyracer
Browse files Browse the repository at this point in the history
Updated base image
  • Loading branch information
cakkineni committed Mar 31, 2015
2 parents 0753c23 + 7355ca3 commit 16b71d0
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog
All notable changes to this project will be documented in this file.

0.2.16 - 2015-3-31
-------------------
### Updated
- Updated base image

0.2.15 - 2015-3-19
-------------------
### Added
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM centurylink/panamax-ruby-base:0.3.0
FROM centurylink/panamax-ruby-base:0.4.0

CMD bundle exec rails s
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ source 'https://rubygems.org'
gem 'rails', '4.1.7'
gem 'puma', '2.8.2'
gem 'sass', '3.3.9'
gem 'therubyracer', '0.12.1', platforms: :ruby
gem 'haml', '4.0.5'
gem 'uglifier', '2.5.1'
gem 'ctl_base_ui'
gem 'ctl_base_ui', '0.0.6'
gem 'activeresource', '4.0.0'
gem 'kramdown', '1.4.0'
gem 'zeroclipboard-rails'
Expand Down
10 changes: 2 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ GEM
thor
crack (0.4.2)
safe_yaml (~> 1.0.0)
ctl_base_ui (0.0.5)
ctl_base_ui (0.0.6)
haml (~> 4.0)
jquery-rails (~> 3.1)
jquery-ui-rails (~> 4.2)
Expand Down Expand Up @@ -86,7 +86,6 @@ GEM
railties (>= 3.2.16)
json (1.8.2)
kramdown (1.4.0)
libv8 (3.16.14.7)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
Expand Down Expand Up @@ -133,7 +132,6 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.0)
ref (1.0.5)
rest-client (1.7.2)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
Expand Down Expand Up @@ -178,9 +176,6 @@ GEM
railties (>= 3.2.5, < 5)
term-ansicolor (1.3.0)
tins (~> 1.0)
therubyracer (0.12.1)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
Expand All @@ -205,7 +200,7 @@ DEPENDENCIES
activeresource (= 4.0.0)
capybara
coveralls (= 0.7.0)
ctl_base_ui
ctl_base_ui (= 0.0.6)
dotenv-rails (= 0.11.1)
haml (= 4.0.5)
its
Expand All @@ -220,7 +215,6 @@ DEPENDENCIES
sass (= 3.3.9)
sinatra (= 1.4.5)
teaspoon
therubyracer (= 0.12.1)
uglifier (= 2.5.1)
webmock
zeroclipboard-rails

0 comments on commit 16b71d0

Please sign in to comment.