From 0b490e876955b5101e2fe5a0c9acc6e65dd50e66 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 20 Jun 2014 11:36:01 +1000 Subject: [PATCH] Add phantomjs to base image, bump up to 0.2.4 --- image/base/Dockerfile | 7 ++++++- image/base_21/Dockerfile | 7 ++++++- launcher | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index 6120880..b021438 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -49,7 +49,12 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\ mkdir -p /etc/runit/1.d &&\ apt-get clean &&\ rm -f /etc/apt/apt.conf.d/40proxy &&\ - locale-gen en_US + locale-gen en_US && + wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ + tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ + rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ + cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\ + rm -fr phantomjs-1.9.7-linux-x86_64 ADD runit-1 /etc/runit/1 ADD runit-1.d-cleanup-pids /etc/runit/1.d/cleanup-pids diff --git a/image/base_21/Dockerfile b/image/base_21/Dockerfile index b4adb32..c23b2dc 100644 --- a/image/base_21/Dockerfile +++ b/image/base_21/Dockerfile @@ -55,7 +55,12 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\ apt-get clean &&\ rm -f /etc/apt/apt.conf.d/40proxy &&\ locale-gen en_US &&\ - mkdir -p /etc/runit/1.d + mkdir -p /etc/runit/1.d &&\ + wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ + tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ + rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ + cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\ + rm -fr phantomjs-1.9.7-linux-x86_64 ADD runit-1 /etc/runit/1 ADD runit-1.d-cleanup-pids /etc/runit/1.d/cleanup-pids diff --git a/launcher b/launcher index 6f3940f..f17fc7c 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:0.2.3 +image=samsaffron/discourse:0.2.4 docker_path=`which docker.io || which docker` docker_ip=`/sbin/ifconfig | \ -- 2.25.1