Skip to content

Commit cf2c5bc

Browse files
aptalcathelamer
authored andcommitted
fix lua warning
1 parent 3e3030f commit cf2c5bc

File tree

6 files changed

+14
-5
lines changed

6 files changed

+14
-5
lines changed

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ RUN \
7272
php7-xmlrpc \
7373
php7-zip && \
7474
echo "**** configure nginx ****" && \
75-
rm -f /etc/nginx/conf.d/default.conf
75+
rm -f /etc/nginx/conf.d/default.conf && \
76+
sed -i \
77+
's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\tlua_load_resty_core off;|g' \
78+
/defaults/nginx.conf
7679

7780
# add local files
7881
COPY root/ /

Dockerfile.aarch64

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ RUN \
7272
php7-xmlrpc \
7373
php7-zip && \
7474
echo "**** configure nginx ****" && \
75-
rm -f /etc/nginx/conf.d/default.conf
75+
rm -f /etc/nginx/conf.d/default.conf && \
76+
sed -i \
77+
's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\tlua_load_resty_core off;|g' \
78+
/defaults/nginx.conf
7679

7780
# add local files
7881
COPY root/ /

Dockerfile.armhf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ RUN \
7272
php7-xmlrpc \
7373
php7-zip && \
7474
echo "**** configure nginx ****" && \
75-
rm -f /etc/nginx/conf.d/default.conf
75+
rm -f /etc/nginx/conf.d/default.conf && \
76+
sed -i \
77+
's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\tlua_load_resty_core off;|g' \
78+
/defaults/nginx.conf
7679

7780
# add local files
7881
COPY root/ /

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
210210

211211
## Versions
212212

213-
* **18.02.20:** - Add geoip2.
213+
* **18.02.20:** - Add geoip2, suppress lua warning.
214214
* **19.12.19:** - Rebasing to alpine 3.11.
215215
* **18.12.19:** - Add php7-imap and php7-pecl-apcu.
216216
* **13.11.19:** - Add php7-pdo_odbc.

readme-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ app_setup_block: |
4040
4141
# changelog
4242
changelogs:
43-
- { date: "18.02.20:", desc: "Add geoip2." }
43+
- { date: "18.02.20:", desc: "Add geoip2, suppress lua warning." }
4444
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
4545
- { date: "18.12.19:", desc: "Add php7-imap and php7-pecl-apcu." }
4646
- { date: "13.11.19:", desc: "Add php7-pdo_odbc." }
File renamed without changes.

0 commit comments

Comments
 (0)