commit c0a11bf623ed1e7ba972a4bfea8f7178623c4006
author Jonathan Springer <jonpspri@gmail.com> Mon Feb 05 14:21:05 2018 -0500
committer Matt Hamann <matthew.hamann@gmail.com> Mon Feb 05 14:21:05 2018 -0500
tree 3c2e09e0bf11dec828f825e0db18385793b954b9
parent c0294da8f398f606db2d03bd72e3bc619a86bd2c

OpenRESTy version bump + Power (#272)

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 24c80f5..918bf3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
     && rm -rf /var/cache/apk/*
 
 # openresty build
-ENV OPENRESTY_VERSION=1.9.7.3 \
+ENV OPENRESTY_VERSION=1.13.6.1 \
     NAXSI_VERSION=0.53-2 \
     PCRE_VERSION=8.37 \
     TEST_NGINX_VERSION=0.24 \
@@ -46,6 +46,17 @@
 	 && rm -rf /tmp/luajit \
      ; fi
 
+RUN  if [ x`uname -m` = xppc64le ]; then \
+         echo "Building LuaJIT for ppc64le" \
+         && mkdir /tmp/luajit  \
+         && cd /tmp/luajit \
+         && curl -k -L https://api.github.com/repos/PPC64/LuaJIT/tarball > luajit.tar.gz \
+         && tar -zxf luajit.tar.gz \
+         && cd PPC64-LuaJIT-* \
+         && make && make install \
+         && rm -rf /tmp/luajit \
+     ; fi
+
 RUN  echo " ... adding Openresty, NGINX, NAXSI and PCRE" \
      && mkdir -p /tmp/api-gateway \
      && readonly NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
@@ -63,6 +74,9 @@
      && if [ x`uname -m` = xs390x ]; then \
           luajitdir="=/usr/local/" \
 	  pcrejit="" \
+        ; elif [ x`uname -m` = xppc64le ]; then \
+          luajitdir="=/usr/local/" \
+          pcrejit="--with-pcre-jit" \
         ; else \
 	  luajitdir="" \
 	  pcrejit="--with-pcre-jit" \
@@ -165,7 +179,7 @@
     && cd ${_prefix}/api-gateway \
     && mkdir -p site/manifest site/pod \
     && cd site \
-    && ln -s ../lualib ./ \
+    && ( [ -x ../lualib ] || ln -s ../lualib ./ ) \
     && ln -s ${_prefix}/api-gateway/bin/opm /usr/bin/opm \
     && ln -s ${_prefix}/api-gateway/bin/resty /usr/bin/resty \
     && rm -rf /tmp/api-gateway