Remove phantomjs and install google-chrome-stable into test base image.

diff --git a/image/auto_build.rb b/image/auto_build.rb
index 40ce7b0af8da887cd2e29d53817deb20935e0f19..bcb88e2d3320849bc2672c9712dfe551c705164a 100644 (file)
--- a/image/auto_build.rb
+++ b/image/auto_build.rb
@@ -41,6 +41,5 @@ raise 'Image not found' unless images.include?(image)
 
 puts "Building #{images[image]}"
 dev_deps() if image == :discourse_dev
-run "(cd base && ./download_phantomjs)" if image == :base
 
-build(images[image])
\ No newline at end of file
+build(images[image])

diff --git a/image/base/.gitignore b/image/base/.gitignore
deleted file mode 100644 (file)
index 1dd5bce..0000000
--- a/image/base/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-phantomjs

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index a170b4012c2a6b8fb3bfb16aa859ecba1e745220..ecd0afff9540381d27c684b1353c8c772735b31e 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -53,7 +53,6 @@ RUN /tmp/install-nginx
 
 RUN apt-get -y install advancecomp jhead jpegoptim libjpeg-turbo-progs optipng
 
-
 RUN mkdir /jemalloc-stable && cd /jemalloc-stable &&\
       wget https://github.com/jemalloc/jemalloc/releases/download/3.6.0/jemalloc-3.6.0.tar.bz2 &&\
       tar -xjf jemalloc-3.6.0.tar.bz2 && cd jemalloc-3.6.0 && ./configure --prefix=/usr && make && make install &&\
@@ -98,12 +97,6 @@ RUN /tmp/install-gifsicle
 ADD install-pngquant /tmp/install-pngquant
 RUN /tmp/install-pngquant
 
-ADD phantomjs /usr/local/bin/phantomjs
-
-# Not using the official repo until they compile against a recent openssl
-# 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 &&\

diff --git a/image/base/download_phantomjs b/image/base/download_phantomjs
deleted file mode 100755 (executable)
index 84dc2f0..0000000
--- a/image/base/download_phantomjs
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker run --rm -it -v `pwd`:/tmp samsaffron/phantomjs cp /usr/bin/phantomjs /tmp

diff --git a/image/build.rb b/image/build.rb
index a5ea380e11db54ca34fe73589afe3bf1b171607c..856837555cbbf7225e0babd3d496d9fb95a88370 100644 (file)
--- a/image/build.rb
+++ b/image/build.rb
@@ -95,7 +95,6 @@ todo.each do |image|
   bump(images[image][:name], options[:version]) if options[:version]
 
   dev_deps() if image == :discourse_dev
-  run "(cd base && ./download_phantomjs)" if image == :base
 
   build(images[image])
 end

diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile
index 8b1886e96b10cbc5e1f16a17ba461f4419d1bfb6..0ef8d3db93c52bd1cc45cc79e0a146ecd0e6a850 100644 (file)
--- a/image/discourse_dev/Dockerfile
+++ b/image/discourse_dev/Dockerfile
@@ -1,6 +1,6 @@
 # NAME:     discourse/discourse_dev
 # VERSION:  release
-FROM discourse/base:release
+FROM discourse/test:release
 
 #LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\""