From: Nicolas Williams <nico@cryptonector.com>
Date: Fri, 24 Feb 2017 04:01:43 +0000 (-0600)
Subject: Revert e7caf68 for Dockerfile
X-Git-Tag: jq-1.6rc1~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3b4ad04f534d1a99b0452884eefe10b084d274f;p=jq

Revert e7caf68 for Dockerfile
---

diff --git a/Dockerfile b/Dockerfile
index 2a40fb1..4161b97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,17 +16,26 @@ RUN apt-get update && \
         ruby \
         wget \
         ruby-dev && \
-    git submodule init && \
-    git submodule update && \
+    wget https://github.com/kkos/oniguruma/archive/v5.9.6.tar.gz -O onig-5.9.6.tar.gz && \
+    sha512sum onig-5.9.6.tar.gz | grep 6b048d345e148c9da38af7a8df76d4a358eb3d4db91fa7834076e511f526a63544284f212b0d56badbbd33112c8b458a5fff02bfbbda012ecfe478bc436ea679 && \
+    tar zxvf onig-5.9.6.tar.gz && \
+    (cd oniguruma-5.9.6 && \
+        touch NEWS ChangeLog && \
+        autoreconf -i && \
+        ./configure --prefix=/usr/local && \
+        make && \
+        make install ) && \
     gem install bundler && \
     (cd /app/docs && bundle install) && \
     (cd /app && \
         autoreconf -i && \
-        ./configure --with-oniguruma=builtin --disable-valgrind --enable-all-static --prefix=/usr/local && \
+        ./configure --disable-valgrind --enable-all-static --prefix=/usr/local && \
         make -j8 && \
         make check && \
         make install && \
         make distclean ) && \
+    (cd oniguruma-5.9.6 && \
+        make uninstall ) && \
     apt-get purge -y \
         build-essential \
         autoconf \
@@ -37,6 +46,7 @@ RUN apt-get update && \
         ruby \
         ruby-dev && \
     apt-get autoremove -y && \
+    rm -rf oniguruma-5.9.6 && \
     rm -rf /var/lib/apt/lists/* /var/lib/gems
 
 ENTRYPOINT ["/usr/local/bin/jq"]