From 4d16f3babe82e3f8208f76ae0d33e3e2e2bd9e68 Mon Sep 17 00:00:00 2001 From: Zoey Date: Sun, 3 Mar 2024 21:40:50 +0100 Subject: [PATCH] add lua-resty-string/lua-resty-openssl/fix logrotate --- Dockerfile | 8 +++++--- rootfs/etc/logrotate | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 92b9177c..e270496e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,7 +72,7 @@ RUN apk upgrade --no-cache -a && \ openssl apache2-utils \ lua5.1-lzlib lua5.1-socket \ coreutils grep jq shadow sudo \ - luarocks5.1 wget lua5.1-dev build-base git yarn && \ + luarocks5.1 lua5.1-dev lua5.1-sec build-base git yarn && \ curl https://raw.githubusercontent.com/acmesh-official/acme.sh/master/acme.sh | sh -s -- --install-online --home /usr/local/acme.sh --nocron && \ git clone https://github.com/coreruleset/coreruleset --branch "$CRS_VER" /tmp/coreruleset && \ mkdir -v /usr/local/nginx/conf/conf.d/include/coreruleset && \ @@ -80,10 +80,12 @@ RUN apk upgrade --no-cache -a && \ mv -v /tmp/coreruleset/plugins /usr/local/nginx/conf/conf.d/include/coreruleset/plugins && \ mv -v /tmp/coreruleset/rules /usr/local/nginx/conf/conf.d/include/coreruleset/rules && \ rm -r /tmp/* && \ - luarocks-5.1 install lua-resty-http && \ luarocks-5.1 install lua-cjson && \ + luarocks-5.1 install lua-resty-http && \ + luarocks-5.1 install lua-resty-string && \ + luarocks-5.1 install lua-resty-openssl && \ yarn global add nginxbeautifier && \ - apk del --no-cache luarocks5.1 wget lua5.1-dev build-base git yarn + apk del --no-cache luarocks5.1 lua5.1-dev lua5.1-sec build-base git yarn COPY --from=backend /build/backend /app COPY --from=frontend /build/frontend/dist /html/frontend diff --git a/rootfs/etc/logrotate b/rootfs/etc/logrotate index 60a7ece6..9fa6dba8 100644 --- a/rootfs/etc/logrotate +++ b/rootfs/etc/logrotate @@ -6,6 +6,6 @@ compress sharedscripts postrotate - if [ -f /usr/local/nginx/logs/nginx.pid ]; then nginx -s reload fi + if [ -f /usr/local/nginx/logs/nginx.pid ]; then nginx -s reload; fi endscript }