From fe79af77b059713600dfa4247503eb86f5383a2b Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Sat, 19 Dec 2015 13:32:33 +0100
Subject: [PATCH] Update the docker container

* 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>
---
 images/base/Dockerfile      | 9 +++++----
 images/build.rb             | 2 +-
 images/intercity/Dockerfile | 2 +-
 launcher                    | 2 +-
 templates/web.template.yml  | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index cf4a2ac..267f259 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -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 &&\
@@ -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
diff --git a/images/build.rb b/images/build.rb
index 7478650..59f77cd 100644
--- a/images/build.rb
+++ b/images/build.rb
@@ -2,7 +2,7 @@
 #
 require 'pty'
 
-$version = "0.1.0"
+$version = "0.1.1"
 
 $base_image = "intercity/base:#{$version}"
 $image = "intercity/intercity:#{$version}"
diff --git a/images/intercity/Dockerfile b/images/intercity/Dockerfile
index 7de43e3..c5c1014 100644
--- a/images/intercity/Dockerfile
+++ b/images/intercity/Dockerfile
@@ -1,4 +1,4 @@
-FROM intercity/base:0.1.0
+FROM intercity/base:0.1.1
 
 MAINTAINER Jeroen van Baarsen "https://twitter.com/jvanbaarsen"
 
diff --git a/launcher b/launcher
index deced48..18c2a02 100755
--- a/launcher
+++ b/launcher
@@ -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
diff --git a/templates/web.template.yml b/templates/web.template.yml
index ac0c3c1..ea664f1 100644
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -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