Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN apk update && \
apk add \
gcc tar libtool zlib perl tzdata \
ca-certificates wget make musl-dev openssl-dev openssl pcre-dev g++ zlib-dev curl python \
perl-test-longstring perl-list-moreutils perl-http-message geoip-dev dumb-init jq \
perl-test-longstring perl-list-moreutils perl-http-message geoip-dev dumb-init jq nginx \
&& update-ca-certificates \
&& rm -rf /var/cache/apk/*

Expand Down Expand Up @@ -83,7 +83,7 @@ RUN echo " ... adding Openresty, NGINX and PCRE" \
&& readonly NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) \
&& echo "using up to $NPROC threads" \
&& cd /tmp/api-gateway/ \
&& curl -k -L https://ftp.pcre.org/pub/pcre/pcre-${PCRE_VERSION}.tar.gz -o /tmp/api-gateway/pcre-${PCRE_VERSION}.tar.gz \
&& curl -k -L https://jztkft.dl.sourceforge.net/project/pcre/pcre/8.37/pcre-8.37.tar.gz -o /tmp/api-gateway/pcre-${PCRE_VERSION}.tar.gz \
&& curl -k -L https://openresty.org/download/openresty-${OPENRESTY_VERSION}.tar.gz -o /tmp/api-gateway/openresty-${OPENRESTY_VERSION}.tar.gz \
&& tar -zxf ./openresty-${OPENRESTY_VERSION}.tar.gz \
&& tar -zxf ./pcre-${PCRE_VERSION}.tar.gz \
Expand All @@ -92,15 +92,6 @@ RUN echo " ... adding Openresty, NGINX and PCRE" \
aarch64) \
luajitdir="" \
pcrejit="--with-pcre-jit" \
; echo " ... Patching ngx_lua and LuaJIT modules for ARM64 ... " \
&& rm -rf ./bundle/ngx_lua-* \
&& curl -k -L https://github.com/openresty/lua-nginx-module/archive/v0.10.14rc3.tar.gz \
| tar -zxf - -C ./bundle \
&& mv ./bundle/lua-nginx-module-0.10.14rc3 ./bundle/ngx_lua-0.10.14rc3 \
&& rm -rf ./bundle/LuaJIT-* \
&& curl -k -L https://github.com/openresty/luajit2/archive/v2.1-20181029.tar.gz \
| tar -zxf - -C ./bundle \
&& mv ./bundle/luajit2-2.1-20181029 ./bundle/LuaJIT-2.2.1-20181029 \
;; \
s390x) \
luajitdir="=/usr/local/" \
Expand Down Expand Up @@ -206,7 +197,6 @@ RUN echo " ... adding Openresty, NGINX and PCRE" \
&& apk del g++ gcc make \
&& rm -rf /var/cache/apk/* \
&& rm -rf /tmp/api-gateway

RUN echo " ... installing opm..." \
&& mkdir -p /tmp/api-gateway \
&& curl -k -L https://github.com/openresty/opm/archive/v${OPM_VERSION}.tar.gz -o /tmp/api-gateway/opm-${OPM_VERSION}.tar.gz \
Expand Down