From 9c81363e84e4a9cb3de7650388977cd4f36a1a9a Mon Sep 17 00:00:00 2001 From: Joakim Olsson Date: Thu, 20 Jun 2019 13:49:12 +0200 Subject: [PATCH] Fix luajit dependency --- Dockerfile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index acc31f2..ef5f3f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu # Install prerequisites for Nginx compile RUN apt-get update && \ - apt-get install -y wget tar gcc libpcre3-dev zlib1g-dev make libssl-dev libluajit-5.1-dev curl jq + apt-get install -y wget tar gcc libpcre3-dev zlib1g-dev make libssl-dev liblua5.1-0 libluajit-5.1-dev curl jq # Download Nginx WORKDIR /tmp @@ -13,22 +13,29 @@ RUN wget http://nginx.org/download/nginx-1.16.0.tar.gz -O nginx.tar.gz && \ # Download Nginx modules RUN wget https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -O ngx_devel_kit.tar.gz && \ mkdir ngx_devel_kit && \ - tar xf ngx_devel_kit.tar.gz -C ngx_devel_kit --strip-components=1 -RUN wget https://github.com/openresty/set-misc-nginx-module/archive/v0.32.tar.gz -O set-misc-nginx-module.tar.gz && \ + tar xf ngx_devel_kit.tar.gz -C ngx_devel_kit --strip-components=1 && \ + wget https://github.com/openresty/set-misc-nginx-module/archive/v0.32.tar.gz -O set-misc-nginx-module.tar.gz && \ mkdir set-misc-nginx-module && \ - tar xf set-misc-nginx-module.tar.gz -C set-misc-nginx-module --strip-components=1 -RUN wget https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -O lua-nginx-module.tar.gz && \ + tar xf set-misc-nginx-module.tar.gz -C set-misc-nginx-module --strip-components=1 && \ + wget https://github.com/openresty/lua-nginx-module/archive/v0.10.15.tar.gz -O lua-nginx-module.tar.gz && \ mkdir lua-nginx-module && \ - tar xf lua-nginx-module.tar.gz -C lua-nginx-module --strip-components=1 + tar xf lua-nginx-module.tar.gz -C lua-nginx-module --strip-components=1 && \ + wget https://github.com/openresty/luajit2/archive/v2.1-20190530.tar.gz -O luajit2.tar.gz && \ + mkdir luajit2 && \ + tar xf luajit2.tar.gz -C luajit2 --strip-components=1 && \ + cd /tmp/luajit2 && \ + make && \make install + # Build Nginx WORKDIR nginx -RUN ./configure --sbin-path=/usr/local/sbin \ +RUN LUAJIT_LIB=/usr/local/lib LUAJIT_INC=/usr/local/include/luajit-2.1 ./configure --sbin-path=/usr/local/sbin \ --conf-path=/etc/nginx/nginx.conf \ --pid-path=/var/run/nginx.pid \ --error-log-path=/var/log/nginx/error.log \ --http-log-path=/var/log/nginx/access.log \ --with-http_ssl_module \ + --with-ld-opt="-Wl,-rpath,/usr/local/lib" \ --add-module=/tmp/ngx_devel_kit \ --add-module=/tmp/set-misc-nginx-module \ --add-module=/tmp/lua-nginx-module && \