commit 2d2eb420a36da9c0d36b10a6d487dd14e2a8712b
author Zack Williams <zdw@artisancomputer.com> Fri May 27 15:41:29 2016 -0700
committer Zack Williams <zdw@artisancomputer.com> Fri May 27 15:41:29 2016 -0700
tree 8cb245e179d9b72a778df1d9d1648243dc09220c
parent d4b402fb712c3147159f15c2954cdd153a5dd741

fix/consolidate phantomjs portions of Dockerfike.base

containers/xos/Dockerfile.base

diff --git a/containers/xos/Dockerfile.base b/containers/xos/Dockerfile.base
index e277385..d89e6e8 100644
--- a/containers/xos/Dockerfile.base
+++ b/containers/xos/Dockerfile.base
@@ -119,13 +119,11 @@
 RUN curl -fLsS $PHANTOMJS_DL_URL -o phantomjs.tar.bz2 && \
   echo "$PHANTOMJS_SHA256  phantomjs.tar.bz2" | sha256sum -c - && \ 
   tar -C /usr/local/share -xjf phantomjs.tar.bz2 && \
+  ln -s /usr/local/share/phantomjs-* /usr/local/share/phantomjs && \
+  ln -s /usr/local/share/phantomjs/bin/phantomjs /bin/phantomjs && \
   rm phantomjs.tar.bz2
 
 RUN git clone git://git.planet-lab.org/fofum.git /tmp/fofum && \
     cd /tmp/fofum; python setup.py install && \
-    rm -rf /tmp/fofum && \
-    tar jxvf /usr/local/share/phantomjs-1.7.0-linux-x86_64.tar.bz2 -C /usr/local/share/ && \
-    rm -f /usr/local/share/phantomjs-1.7.0-linux-x86_64.tar.bz2 && \
-    ln -s /usr/local/share/phantomjs-1.7.0-linux-x86_64 /usr/local/share/phantomjs && \
-    ln -s /usr/local/share/phantomjs/bin/phantomjs /bin/phantomjs
+    rm -rf /tmp/fofum