diff --git a/CHANGELOG.md b/CHANGELOG.md index 241be3d5..1f763df1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Dockerfile b/Dockerfile index 6584d63c..8609e748 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Gemfile b/Gemfile index 6f7dc59d..21560158 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index e1dfc0d4..a78d5911 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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) @@ -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) @@ -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) @@ -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 @@ -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