diff --git a/phantomjs/Dockerfile b/phantomjs/Dockerfile index f4a8859..dd7122e 100644 --- a/phantomjs/Dockerfile +++ b/phantomjs/Dockerfile @@ -2,7 +2,7 @@ # Dockerfile for building PhantomJS # -FROM ubuntu:15.04 +FROM ubuntu:14.04 MAINTAINER kev RUN apt-get update \ @@ -11,6 +11,7 @@ RUN apt-get update \ libpng-dev libjpeg-dev python \ && git clone git://github.com/ariya/phantomjs.git \ && cd phantomjs \ + && git checkout 2.0 \ && echo y | ./build.sh 2>/dev/null 1>&2 \ && install -v -s -m 755 bin/phantomjs /usr/local/bin/ \ && cd .. \ @@ -19,7 +20,7 @@ RUN apt-get update \ libsqlite3-dev libfontconfig1-dev libicu-dev libfreetype6 libssl-dev \ libpng-dev libjpeg-dev python \ && apt-get autoremove -y \ - && apt-get install -y libfontconfig1 libicu52 libjpeg62-turbo \ + && apt-get install -y libfontconfig1 libicu52 libjpeg8 \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* diff --git a/phantomjs/Dockerfile.trusty b/phantomjs/Dockerfile.trusty deleted file mode 100644 index dd7122e..0000000 --- a/phantomjs/Dockerfile.trusty +++ /dev/null @@ -1,27 +0,0 @@ -# -# Dockerfile for building PhantomJS -# - -FROM ubuntu:14.04 -MAINTAINER kev - -RUN apt-get update \ - && apt-get install -y git build-essential g++ flex bison gperf ruby perl \ - libsqlite3-dev libfontconfig1-dev libicu-dev libfreetype6 libssl-dev \ - libpng-dev libjpeg-dev python \ - && git clone git://github.com/ariya/phantomjs.git \ - && cd phantomjs \ - && git checkout 2.0 \ - && echo y | ./build.sh 2>/dev/null 1>&2 \ - && install -v -s -m 755 bin/phantomjs /usr/local/bin/ \ - && cd .. \ - && rm -rf phantomjs \ - && apt-get remove -y git build-essential g++ flex bison gperf ruby perl \ - libsqlite3-dev libfontconfig1-dev libicu-dev libfreetype6 libssl-dev \ - libpng-dev libjpeg-dev python \ - && apt-get autoremove -y \ - && apt-get install -y libfontconfig1 libicu52 libjpeg8 \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* - -CMD ["/usr/local/bin/phantomjs"]