Skip to content

Commit

Permalink
Update the docker container
Browse files Browse the repository at this point in the history
* Update to Ruby 2.2.4
* Install backup gem in base container
* Add backup task to cron

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
  • Loading branch information
jvanbaarsen committed Dec 19, 2015
1 parent b96c48f commit fe79af7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
9 changes: 5 additions & 4 deletions images/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# NAME: intercity_base
# VERSION: 0.1.0
# VERSION: 0.1.1

FROM ubuntu:14.04

MAINTAINER Jeroen van Baarsen "https://twitter.com/jvanbaarsen"

RUN echo "0.1.0" > /VERSION
RUN echo "0.1.1" > /VERSION

# Install dependencies
RUN apt-get -y upgrade &&\
Expand All @@ -28,10 +28,11 @@ RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
mkdir /src && cd /src &&\
git clone https://github.com/sstephenson/ruby-build.git &&\
cd /src/ruby-build && ./install.sh &&\
cd / && rm -rf /src/ruby-build && ruby-build 2.2.3 /usr/local &&\
cd / && rm -rf /src/ruby-build && ruby-build 2.2.4 /usr/local &&\
gem update --system &&\
gem install bundler &&\
rm -rf /usr/local/share/ri/2.2.3/system
gem install backup &&\
rm -rf /usr/local/share/ri/2.2.4/system

# Install Pups
RUN cd / && git clone https://github.com/SamSaffron/pups.git
Expand Down
2 changes: 1 addition & 1 deletion images/build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
require 'pty'

$version = "0.1.0"
$version = "0.1.1"

$base_image = "intercity/base:#{$version}"
$image = "intercity/intercity:#{$version}"
Expand Down
2 changes: 1 addition & 1 deletion images/intercity/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM intercity/base:0.1.0
FROM intercity/base:0.1.1

MAINTAINER Jeroen van Baarsen "https://twitter.com/jvanbaarsen"

Expand Down
2 changes: 1 addition & 1 deletion launcher
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

app_name=intercity
app_path="/var/$app_name"
image=intercity/intercity:0.1.0
image=intercity/intercity:0.1.1

command=$1
config=$2
Expand Down
2 changes: 1 addition & 1 deletion templates/web.template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ run:
- su intercity -c 'bundle exec rake db:migrate'
- su intercity -c 'bundle exec rake assets:precompile'
- su intercity -c 'bundle exec rake intercity:seed_plugins'
- su intercity -c 'bundle exec whenever -c -f /var/www/intercity/config/backup_schedule.rb'
- su intercity -c 'bundle exec whenever -w -f /var/www/intercity/config/backup_schedule.rb'

- file:
path: /usr/local/bin/rails
Expand Down

0 comments on commit fe79af7

Please sign in to comment.