From a2ed18c937ab12fee0cc545973ada7fd8bc1dbc1 Mon Sep 17 00:00:00 2001 From: Sean Callan Date: Fri, 26 Sep 2014 11:18:32 -0700 Subject: [PATCH 1/2] Update dependencies to the latest and greatest --- Gemfile | 18 ++++++------ Gemfile.lock | 82 ++++++++++++++++++++++++++++------------------------ 2 files changed, 53 insertions(+), 47 deletions(-) diff --git a/Gemfile b/Gemfile index 0709cc0..37b4365 100644 --- a/Gemfile +++ b/Gemfile @@ -1,16 +1,16 @@ source 'https://rubygems.org' -gem 'activesupport', '~> 4.1.1' -gem 'barby', '~> 0.6.1' -gem 'builder', '~> 3.2.2' -gem 'rmagick', '2.13.2', require: false +gem 'activesupport' +gem 'barby' +gem 'builder' +gem 'rmagick', require: false gem 'rqrcode' -gem 'sinatra', '~> 1.4.5' -gem "sinatra-cross_origin", "~> 0.3.1" -gem 'sinatra-contrib', '~> 1.4.2' +gem 'sinatra' +gem 'sinatra-cross_origin' +gem 'sinatra-contrib' group :development, :test do - gem 'icepick', '~> 1.1.1' + gem 'icepick' gem 'rake' end @@ -19,5 +19,5 @@ group :test do gem 'rack-test' gem 'rr' gem 'rspec' - gem 'simplecov', '~> 0.7', require: false + gem 'simplecov', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index b6d3614..5ceea05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.1.1) + activesupport (4.1.6) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) awesome_print (1.2.0) - backports (3.6.0) + backports (3.6.1) barby (0.6.1) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) @@ -17,9 +17,9 @@ GEM columnize (~> 0.3) debugger-linecache (~> 1.2) coderay (1.1.0) - colorize (0.7.3) + colorize (0.6.0) columnize (0.8.9) - coveralls (0.7.0) + coveralls (0.7.1) multi_json (~> 1.3) rest-client simplecov (>= 0.7) @@ -28,20 +28,21 @@ GEM debug_inspector (0.0.2) debugger-linecache (1.2.0) diff-lcs (1.2.5) - docile (1.1.3) - i18n (0.6.9) - icepick (1.1.1) + docile (1.1.5) + i18n (0.6.11) + icepick (1.1.0) awesome_print (~> 1.2) - colorize (~> 0.7.2) + colorize (~> 0.6.0) pry (~> 0.9.12) pry-byebug (~> 1.3.2) - pry-doc (~> 0.6.0) + pry-doc (~> 0.4.6) pry-stack_explorer (~> 0.4.9) json (1.8.1) method_source (0.8.2) mime-types (2.3) - minitest (5.3.4) + minitest (5.4.1) multi_json (1.10.1) + netrc (0.7.7) pry (0.9.12.6) coderay (~> 1.0) method_source (~> 0.8) @@ -49,9 +50,9 @@ GEM pry-byebug (1.3.2) byebug (~> 2.7) pry (~> 0.9.12) - pry-doc (0.6.0) - pry (~> 0.9) - yard (~> 0.8) + pry-doc (0.4.6) + pry (>= 0.9) + yard (>= 0.8) pry-stack_explorer (0.4.9.1) binding_of_caller (>= 0.7) pry (>= 0.9.11) @@ -61,22 +62,27 @@ GEM rack-test (0.6.2) rack (>= 1.0) rake (10.3.2) - rest-client (1.6.7) - mime-types (>= 1.16) - rmagick (2.13.2) + rest-client (1.7.2) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rmagick (2.13.3) rqrcode (0.4.2) rr (1.1.2) - rspec (2.14.1) - rspec-core (~> 2.14.0) - rspec-expectations (~> 2.14.0) - rspec-mocks (~> 2.14.0) - rspec-core (2.14.8) - rspec-expectations (2.14.5) - diff-lcs (>= 1.1.3, < 2.0) - rspec-mocks (2.14.6) - simplecov (0.8.2) + rspec (3.1.0) + rspec-core (~> 3.1.0) + rspec-expectations (~> 3.1.0) + rspec-mocks (~> 3.1.0) + rspec-core (3.1.4) + rspec-support (~> 3.1.0) + rspec-expectations (3.1.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.1.0) + rspec-mocks (3.1.2) + rspec-support (~> 3.1.0) + rspec-support (3.1.1) + simplecov (0.9.1) docile (~> 1.1.0) - multi_json + multi_json (~> 1.0) simplecov-html (~> 0.8.0) simplecov-html (0.8.0) sinatra (1.4.5) @@ -91,14 +97,14 @@ GEM sinatra (~> 1.4.0) tilt (~> 1.3) sinatra-cross_origin (0.3.2) - slop (3.5.0) + slop (3.6.0) term-ansicolor (1.3.0) tins (~> 1.0) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - tins (1.3.0) - tzinfo (1.2.0) + tins (1.3.3) + tzinfo (1.2.2) thread_safe (~> 0.1) yard (0.8.7.4) @@ -106,18 +112,18 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 4.1.1) - barby (~> 0.6.1) - builder (~> 3.2.2) + activesupport + barby + builder coveralls - icepick (~> 1.1.1) + icepick rack-test rake - rmagick (= 2.13.2) + rmagick rqrcode rr rspec - simplecov (~> 0.7) - sinatra (~> 1.4.5) - sinatra-contrib (~> 1.4.2) - sinatra-cross_origin (~> 0.3.1) + simplecov + sinatra + sinatra-contrib + sinatra-cross_origin From 2f4308fc35b5ff09eb080a8dc404b9fac47e28d3 Mon Sep 17 00:00:00 2001 From: james brink Date: Mon, 6 Oct 2014 18:31:17 -0700 Subject: [PATCH 2/2] Updated Gemfile to include a production group, added bundle exec to the start script. Also updated base docker image to ubuntu 14.04.1 --- Dockerfile | 6 +++--- Gemfile | 4 ++++ Gemfile.lock | 7 +++++++ docker-scripts/start-barcoded.sh | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index c968053..16348d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ # Barcoded # -# VERSION 1.0 +# VERSION 1.1.0 -FROM ubuntu:14.04 +FROM ubuntu:14.04.1 MAINTAINER Sean Callan, James Brink # Make sure the package repository is up to date RUN apt-get update - +RUN apt-get dist-upgrade -y # Ruby is required to build Ruby 2.1.2 RUN apt-get install -y wget curl ruby RUN apt-get install -y imagemagick libmagickcore-dev libmagickwand-dev diff --git a/Gemfile b/Gemfile index 37b4365..073dd72 100644 --- a/Gemfile +++ b/Gemfile @@ -21,3 +21,7 @@ group :test do gem 'rspec' gem 'simplecov', require: false end + +group :production do + gem 'unicorn', '~> 4.8.3' +end diff --git a/Gemfile.lock b/Gemfile.lock index 5ceea05..f045952 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,7 @@ GEM pry-doc (~> 0.4.6) pry-stack_explorer (~> 0.4.9) json (1.8.1) + kgio (2.9.2) method_source (0.8.2) mime-types (2.3) minitest (5.4.1) @@ -61,6 +62,7 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) + raindrops (0.13.0) rake (10.3.2) rest-client (1.7.2) mime-types (>= 1.16, < 3.0) @@ -106,6 +108,10 @@ GEM tins (1.3.3) tzinfo (1.2.2) thread_safe (~> 0.1) + unicorn (4.8.3) + kgio (~> 2.6) + rack + raindrops (~> 0.7) yard (0.8.7.4) PLATFORMS @@ -127,3 +133,4 @@ DEPENDENCIES sinatra sinatra-contrib sinatra-cross_origin + unicorn (~> 4.8.3) diff --git a/docker-scripts/start-barcoded.sh b/docker-scripts/start-barcoded.sh index b2294f0..79cb358 100644 --- a/docker-scripts/start-barcoded.sh +++ b/docker-scripts/start-barcoded.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash # This script is the entry point for the Docker container if /usr/local/docker-scripts/edit-unicorn-config.rb; then - cd /app/ && unicorn -c /app/config/unicorn.rb -E $RACK_ENV + cd /app/ && bundle exec unicorn -c /app/config/unicorn.rb -E $RACK_ENV fi