diff --git a/Dockerfile b/Dockerfile index b2e938b..177f536 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,9 @@ RUN circleci-install firefox ADD circleci-provision-scripts/chrome.sh /opt/circleci-provision-scripts/chrome.sh RUN circleci-install chrome +ADD circleci-provision-scripts/phantomjs.sh /opt/circleci-provision-scripts/phantomjs.sh +RUN circleci-install phantomjs + # Android ADD scripts/circle-android /usr/local/bin/circle-android ADD circleci-provision-scripts/android-sdk.sh /opt/circleci-provision-scripts/android-sdk.sh diff --git a/circleci-provision-scripts/clojure.sh b/circleci-provision-scripts/clojure.sh old mode 100644 new mode 100755 diff --git a/circleci-provision-scripts/java.sh b/circleci-provision-scripts/java.sh index 457a2c6..43b10fa 100755 --- a/circleci-provision-scripts/java.sh +++ b/circleci-provision-scripts/java.sh @@ -21,6 +21,8 @@ function install_oraclejdk8() { update-alternatives --install "/usr/bin/javac" "javac" "/usr/lib/jvm/jdk1.8.0/bin/javac" 1 update-alternatives --install "/usr/bin/javaws" "javaws" "/usr/lib/jvm/jdk1.8.0/bin/javaws" 1 + echo 'export PATH=/usr/lib/jvm/jdk1.8.0/bin:$PATH' >> ${CIRCLECI_HOME}/.circlerc + popd rm -rf $JAVA_TMP diff --git a/circleci-provision-scripts/phantomjs.sh b/circleci-provision-scripts/phantomjs.sh new file mode 100755 index 0000000..1a4031a --- /dev/null +++ b/circleci-provision-scripts/phantomjs.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +function install_phantomjs() { + echo '>>> Installing PhantomJS' + + curl --output /home/ubuntu/bin/phantomjs-2.0.1-linux-x86_64-dynamic https://s3.amazonaws.com/circle-support-bucket/phantomjs/phantomjs-2.0.1-linux-x86_64-dynamic + chmod a+x /home/ubuntu/bin/phantomjs-2.0.1-linux-x86_64-dynamic + sudo ln -s --force /home/ubuntu/bin/phantomjs-2.0.1-linux-x86_64-dynamic /usr/local/bin/phantomjs +}