Skip to content

Commit c4c126b

Browse files
committed
Update NGINX new-tag
1 parent 2d2b954 commit c4c126b

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

build/Dockerfile

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,18 @@ ARG LUA_VERSION=lua-1.0.11
3434

3535
ENV MODULES_DIR=/usr/lib/nginx/modules
3636

37+
3738
RUN apt-get update \
3839
&& apt-get install --no-install-recommends --no-install-suggests -y \
3940
libcap2-bin \
4041
libc-ares2 \
41-
libluajit-5.1-2 \
4242
libpcre2-8-0 \
4343
&& rm -rf /var/lib/apt/lists/*
4444

4545
ADD https://github.com/airslate-ops/nginx-ingress-controller/releases/download/${LUA_VERSION}/libluajit-5.1.so.2 /usr/local/lib/
46-
RUN ln -sf /usr/local/lib/libluajit-5.1.so.2 /usr/local/lib/libluajit-5.1.so || true \
47-
&& printf "/usr/local/lib\n" > /etc/ld.so.conf.d/zz-nginx-luajit.conf \
46+
RUN cp -a /usr/local/lib/libluajit-5.1.so.2 /usr/lib/x86_64-linux-gnu/ \
47+
&& ln -sf /usr/local/lib/libluajit-5.1.so.2 /usr/local/lib/libluajit-5.1.so \
48+
&& printf "/usr/local/lib\n/usr/lib/x86_64-linux-gnu\n" > /etc/ld.so.conf.d/zz-nginx-luajit.conf \
4849
&& ldconfig
4950

5051
ADD https://github.com/airslate-ops/nginx-ingress-controller/releases/download/${VTS_VERSION}/ngx_http_vhost_traffic_status_module.so ${MODULES_DIR}/
@@ -54,7 +55,18 @@ ADD https://github.com/airslate-ops/nginx-ingress-controller/releases/download/$
5455
ADD https://github.com/airslate-ops/nginx-ingress-controller/releases/download/${LUA_VERSION}/ndk_http_module.so ${MODULES_DIR}/
5556
ADD https://github.com/airslate-ops/nginx-ingress-controller/releases/download/${LUA_VERSION}/ngx_http_lua_module.so ${MODULES_DIR}/
5657

57-
RUN find ${MODULES_DIR} -type f -name '*.so' -exec chmod 0644 {} \; && ldconfig
58+
RUN find ${MODULES_DIR} -type f -name '*.so' -exec chmod 0644 {} \; \
59+
&& ldconfig
60+
61+
RUN /bin/sh -ceu '\
62+
cat > /tmp/min.conf <<EOF\n\
63+
load_module /usr/lib/nginx/modules/ndk_http_module.so;\n\
64+
load_module /usr/lib/nginx/modules/ngx_http_lua_module.so;\n\
65+
events {}\n\
66+
http {}\n\
67+
EOF\n\
68+
nginx -t -c /tmp/min.conf \
69+
'
5870
############################################# NGINX files #############################################
5971
FROM scratch AS nginx-files
6072
ARG IC_VERSION

0 commit comments

Comments
 (0)