From ba27de2fd4cf406a1e3164675683de6a5acde370 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Fri, 12 Aug 2016 11:11:59 -0700
Subject: [PATCH] Add phantomjs2 images

We want to keep the old images so the current stable and patch releases continue to work.
---
 .gitlab-ci.yml                 | 3 +++
 Dockerfile.ruby-2.1-phantomjs2 | 8 ++++++++
 Dockerfile.ruby-2.2-phantomjs2 | 8 ++++++++
 Dockerfile.ruby-2.3-phantomjs2 | 8 ++++++++
 scripts/install-phantomjs      | 9 ++++++---
 5 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 Dockerfile.ruby-2.1-phantomjs2
 create mode 100644 Dockerfile.ruby-2.2-phantomjs2
 create mode 100644 Dockerfile.ruby-2.3-phantomjs2

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c0d8ae..d31de45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,9 @@ ruby-2.3 test: *test_build
 www-gitlab-com test: *test_build
 
 ruby-2.1: *build_and_deploy
+ruby-2.1-phantomjs2: *build_and_deploy
 ruby-2.2: *build_and_deploy
+ruby-2.2-phantomjs2: *build_and_deploy
 ruby-2.3: *build_and_deploy
+ruby-2.3-phantomjs2: *build_and_deploy
 www-gitlab-com: *build_and_deploy
diff --git a/Dockerfile.ruby-2.1-phantomjs2 b/Dockerfile.ruby-2.1-phantomjs2
new file mode 100644
index 0000000..9868f32
--- /dev/null
+++ b/Dockerfile.ruby-2.1-phantomjs2
@@ -0,0 +1,8 @@
+FROM ruby:2.1
+
+ENV PACKAGES="git-core" \
+	LC_ALL=en_US.UTF-8
+
+ADD / /
+RUN /scripts/install-essentials
+RUN /scripts/install-phantomjs 2.1.1
diff --git a/Dockerfile.ruby-2.2-phantomjs2 b/Dockerfile.ruby-2.2-phantomjs2
new file mode 100644
index 0000000..46fcdd2
--- /dev/null
+++ b/Dockerfile.ruby-2.2-phantomjs2
@@ -0,0 +1,8 @@
+FROM ruby:2.2
+
+ENV PACKAGES="git-core" \
+	LC_ALL=en_US.UTF-8
+
+ADD / /
+RUN /scripts/install-essentials
+RUN /scripts/install-phantomjs 2.1.1
diff --git a/Dockerfile.ruby-2.3-phantomjs2 b/Dockerfile.ruby-2.3-phantomjs2
new file mode 100644
index 0000000..02be75b
--- /dev/null
+++ b/Dockerfile.ruby-2.3-phantomjs2
@@ -0,0 +1,8 @@
+FROM ruby:2.3
+
+ENV PACKAGES="git-core" \
+	LC_ALL=en_US.UTF-8
+
+ADD / /
+RUN /scripts/install-essentials
+RUN /scripts/install-phantomjs 2.1.1
diff --git a/scripts/install-phantomjs b/scripts/install-phantomjs
index 9de98b2..f58d58e 100755
--- a/scripts/install-phantomjs
+++ b/scripts/install-phantomjs
@@ -3,6 +3,9 @@
 set -xeo pipefail
 
 cd /tmp
-wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
-dpkg -i phantomjs_1.9.8-0jessie_amd64.deb
-rm /tmp/*
+
+PHANTOMJS_VERSION=${1:-1.9.8}
+PHANTOMJS_FILE="phantomjs-$PHANTOMJS_VERSION-linux-x86_64"
+curl -L "https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOMJS_FILE.tar.bz2" | tar jx
+cp "$PHANTOMJS_FILE/bin/phantomjs" "/usr/bin/"
+rm -rf /tmp/*