SECURITY: upgrade CVE-2014-6271 bash vulnerability

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 855c231f5b6fd3529ec961d70ebb0d0af163f18b..a67d99708202af1ac700a96a5eb90844005d2e55 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -2,7 +2,7 @@
 # When new LTS ships we can upgrade
 
 # NAME:     discourse_base
-# VERSION:  1.0.3
+# VERSION:  1.0.4
 
 FROM ubuntu:14.04
 
@@ -60,11 +60,14 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
 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.0.0-p481 /usr/local &&\
+    cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p576 /usr/local &&\
     gem update --system &&\
-    gem install bundler
+    gem install bundler &&\
+    rm -rf /usr/local/share/ri/2.0.0/system &&\
+    cd / && git clone https://github.com/SamSaffron/pups.git
 
-RUN cd / && git clone https://github.com/SamSaffron/pups.git
+# clean up for docker squash
+RUN rm -fr /usr/share/man && rm -fr /usr/share/doc
 
 ADD runit-1 /etc/runit/1
 ADD runit-1.d-cleanup-pids /etc/runit/1.d/cleanup-pids

diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile
index 3fc9716c0a5c33f7e37025224cfe068484dab616..bd15c9ec371b9d53f0d8d982d9830351363c1a32 100644 (file)
--- a/image/discourse/Dockerfile
+++ b/image/discourse/Dockerfile
@@ -1,5 +1,5 @@
-# Current version 1.0.3
-FROM samsaffron/discourse_base:1.0.3
+# Current version 1.0.4
+FROM samsaffron/discourse_base:1.0.4
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 

diff --git a/launcher b/launcher
index 520271914a9c10c4c1b4efbada0c48ee7ce4d875..45d8cc8fe41419c2ab26173a6d70a5d8a132e76c 100755 (executable)
--- a/launcher
+++ b/launcher
@@ -13,7 +13,7 @@ config_file=containers/"$config".yml
 cidfile=cids/"$config".cid
 cidbootstrap=cids/"$config"_boostrap.cid
 local_discourse=local_discourse
-image=samsaffron/discourse:1.0.3
+image=samsaffron/discourse:1.0.4
 docker_path=`which docker.io || which docker`
 
 if [ "${SUPERVISED}" = "true" ]; then