From cf2c5bcdf9f6fab5866aeeda67f0481bede8e049 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 18 Feb 2020 17:22:14 -0500 Subject: [PATCH] fix lua warning --- Dockerfile | 5 ++++- Dockerfile.aarch64 | 5 ++++- Dockerfile.armhf | 5 ++++- README.md | 2 +- readme-vars.yml | 2 +- root/etc/cont-init.d/{30-config => 40-config} | 0 6 files changed, 14 insertions(+), 5 deletions(-) rename root/etc/cont-init.d/{30-config => 40-config} (100%) diff --git a/Dockerfile b/Dockerfile index 26a1ee8..ac3c668 100644 --- a/Dockerfile +++ b/Dockerfile @@ -72,7 +72,10 @@ RUN \ php7-xmlrpc \ php7-zip && \ echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf + rm -f /etc/nginx/conf.d/default.conf && \ + sed -i \ + 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\tlua_load_resty_core off;|g' \ + /defaults/nginx.conf # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index dabd3a3..0017872 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -72,7 +72,10 @@ RUN \ php7-xmlrpc \ php7-zip && \ echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf + rm -f /etc/nginx/conf.d/default.conf && \ + sed -i \ + 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\tlua_load_resty_core off;|g' \ + /defaults/nginx.conf # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8eadd34..5cad1af 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -72,7 +72,10 @@ RUN \ php7-xmlrpc \ php7-zip && \ echo "**** configure nginx ****" && \ - rm -f /etc/nginx/conf.d/default.conf + rm -f /etc/nginx/conf.d/default.conf && \ + sed -i \ + 's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\tlua_load_resty_core off;|g' \ + /defaults/nginx.conf # add local files COPY root/ / diff --git a/README.md b/README.md index 4858eee..35dda58 100644 --- a/README.md +++ b/README.md @@ -210,7 +210,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **18.02.20:** - Add geoip2. +* **18.02.20:** - Add geoip2, suppress lua warning. * **19.12.19:** - Rebasing to alpine 3.11. * **18.12.19:** - Add php7-imap and php7-pecl-apcu. * **13.11.19:** - Add php7-pdo_odbc. diff --git a/readme-vars.yml b/readme-vars.yml index 7160447..96c6b4e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -40,7 +40,7 @@ app_setup_block: | # changelog changelogs: - - { date: "18.02.20:", desc: "Add geoip2." } + - { date: "18.02.20:", desc: "Add geoip2, suppress lua warning." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "18.12.19:", desc: "Add php7-imap and php7-pecl-apcu." } - { date: "13.11.19:", desc: "Add php7-pdo_odbc." } diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/40-config similarity index 100% rename from root/etc/cont-init.d/30-config rename to root/etc/cont-init.d/40-config