From 5b87f254e27596b8094cffa8dac14a93a922dbb5 Mon Sep 17 00:00:00 2001 From: Zak Henry Date: Mon, 25 Jan 2016 16:48:00 +1100 Subject: [PATCH 1/2] Upgraded to latest offical phantomjs image --- Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index e059109..26bf41c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,27 +51,27 @@ RUN npm install -g \ gulp bower # Then install phantomjs with : -ENV PHANTOM_JS_VERSION 2.0.0-debian-x86_64 +ENV PHANTOM_JS_VERSION 2.1.1-linux-x86_64 +## Backup phantomjs install option for specific remote version # create dir to save phantom -RUN mkdir -p /opt/phantomjs -WORKDIR /opt/phantomjs +#RUN mkdir -p /opt/phantomjs +#WORKDIR /opt/phantomjs # download the file (this will take time) -RUN mkdir -p /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION/bin -RUN curl -sL -o /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION.zip https://github.com/jakemauer/phantomjs/releases/download/2.0.0-debian-bin/phantomjs-$PHANTOM_JS_VERSION.zip -RUN unzip /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION.zip -d /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION/bin -RUN rm -f /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION.zip -RUN ln -s /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION/bin/phantomjs /usr/bin/phantomjs +#RUN mkdir -p /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION/bin +#RUN curl -sL -o /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION.zip https://github.com/jakemauer/phantomjs/releases/download/2.0.0-debian-bin/phantomjs-$PHANTOM_JS_VERSION.zip +#RUN unzip /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION.zip -d /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION/bin +#RUN rm -f /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION.zip +#RUN ln -s /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION/bin/phantomjs /usr/bin/phantomjs -# @todo restore the official bitbucket.org/ariya version when they release phantom2 -# RUN curl -LO https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-$PHANTOM_JS_VERSION.tar.bz2 -# RUN tar xjf phantomjs-$PHANTOM_JS_VERSION.tar.bz2 +RUN curl -LO https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-$PHANTOM_JS_VERSION.tar.bz2 +RUN tar xjf phantomjs-$PHANTOM_JS_VERSION.tar.bz2 # symlink to /usr/bin and check install -# RUN ln -s /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION/bin/phantomjs /usr/bin/phantomjs && \ -# rm phantomjs-$PHANTOM_JS_VERSION.tar.bz2 +RUN ln -s /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION/bin/phantomjs /usr/bin/phantomjs && \ + rm phantomjs-$PHANTOM_JS_VERSION.tar.bz2 RUN which phantomjs && phantomjs --version From baad86d7f6936ed5f7af87a6694c60d41d85a799 Mon Sep 17 00:00:00 2001 From: Zak Henry Date: Mon, 25 Jan 2016 16:51:49 +1100 Subject: [PATCH 2/2] Whitespace --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 26bf41c..7338584 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,6 @@ ENV PHANTOM_JS_VERSION 2.1.1-linux-x86_64 #RUN mkdir -p /opt/phantomjs #WORKDIR /opt/phantomjs - # download the file (this will take time) #RUN mkdir -p /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION/bin #RUN curl -sL -o /opt/phantomjs/phantomjs-$PHANTOM_JS_VERSION.zip https://github.com/jakemauer/phantomjs/releases/download/2.0.0-debian-bin/phantomjs-$PHANTOM_JS_VERSION.zip