Skip to content

Commit

Permalink
Updated Gemfile to include a production group, added bundle exec to t…
Browse files Browse the repository at this point in the history
…he start script. Also updated base docker image to ubuntu 14.04.1
  • Loading branch information
jamesbrink committed Oct 7, 2014
1 parent a2ed18c commit 2f4308f
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ group :test do
gem 'rspec'
gem 'simplecov', require: false
end

group :production do
gem 'unicorn', '~> 4.8.3'
end
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -127,3 +133,4 @@ DEPENDENCIES
sinatra
sinatra-contrib
sinatra-cross_origin
unicorn (~> 4.8.3)
2 changes: 1 addition & 1 deletion docker-scripts/start-barcoded.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 2f4308f

Please sign in to comment.