From dc7a8ede796d6a151cc64e596bee6ba23e41a844 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 23 May 2016 13:02:39 +1000 Subject: [PATCH] bump image, shave off some more bytes --- image/base/Dockerfile | 11 +++++++++-- image/build.rb | 2 +- image/discourse/Dockerfile | 4 ++-- image/discourse_test/Dockerfile | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index 499da34..bd200f9 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -1,5 +1,5 @@ # NAME: discourse_base -# VERSION: 1.3.0 +# VERSION: 1.3.1 FROM ubuntu:16.04 @@ -79,6 +79,10 @@ RUN gem update --system &&\ rm -rf /usr/local/share/ri/2.3.0/system &&\ cd / && git clone https://github.com/SamSaffron/pups.git +RUN cd tmp && wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 + +RUN cd tmp && tar jxf phantomjs-2.1.1-linux-x86_64.tar.bz2 && mv /tmp/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin + # clean up for docker squash RUN rm -fr /usr/share/man &&\ rm -fr /usr/share/doc &&\ @@ -88,7 +92,10 @@ RUN rm -fr /usr/share/man &&\ rm -fr /usr/local/share/doc &&\ rm -fr /usr/local/share/ruby-build &&\ rm -fr /root/.gem &&\ - rm -fr /root/.npm + rm -fr /root/.npm &&\ + rm -fr /tmp/* &&\ + rm -fr /usr/share/vim/vim74/spell/en* + # this can probably be done, but I worry that people changing PG locales will have issues # cd /usr/share/locale && rm -fr `ls -d */ | grep -v en` diff --git a/image/build.rb b/image/build.rb index 8426815..d6b160b 100644 --- a/image/build.rb +++ b/image/build.rb @@ -2,7 +2,7 @@ # require 'pty' -$version = "1.3.0" +$version = "1.3.1" $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.2.0/docker-squash-linux-amd64-v0.2.0.tar.gz" diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile index 8e52c26..335d4ac 100644 --- a/image/discourse/Dockerfile +++ b/image/discourse/Dockerfile @@ -1,5 +1,5 @@ -# Current version 1.3.0 -FROM discourse/base:1.3.0 +# Current version 1.3.1 +FROM discourse/base:1.3.1 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index d341f66..7e7c384 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -1,4 +1,4 @@ -FROM discourse/discourse:1.3.0 +FROM discourse/discourse:1.3.1 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" -- 2.25.1