From 05a13f9e3cf0d71c807f4747227131b9fad17d09 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 26 Sep 2014 15:45:22 +1000 Subject: [PATCH] SECURITY: upgrade CVE-2014-6271 bash vulnerability --- image/base/Dockerfile | 11 +++++++---- image/discourse/Dockerfile | 4 ++-- launcher | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index 855c231..a67d997 100644 --- 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 3fc9716..bd15c9e 100644 --- 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 5202719..45d8cc8 100755 --- 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 -- 2.25.1