LAB-linuxserver/docker-nginx
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-nginx.git synced 2026-02-20 00:54:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

add brotli and dav-ext, remove lua

Browse Source
This commit is contained in:
aptalca 2021-02-09 11:03:08 -05:00
parent f5ddbad5c8
commit 7fb72aef71
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -15,14 +15,14 @@ RUN \
curl \
memcached \
nginx \
nginx-mod-http-brotli \
nginx-mod-http-dav-ext \
nginx-mod-http-echo \
nginx-mod-http-fancyindex \
nginx-mod-http-geoip \
nginx-mod-http-geoip2 \
nginx-mod-http-headers-more \
nginx-mod-http-image-filter \
nginx-mod-http-lua \
nginx-mod-http-lua-upstream \
nginx-mod-http-nchan \
nginx-mod-http-perl \
nginx-mod-http-redis2 \
@ -76,7 +76,7 @@ RUN \
echo "**** configure nginx ****" && \
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' \
's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \
/defaults/nginx.conf
# add local files

6
Dockerfile.aarch64
View File

@ -15,14 +15,14 @@ RUN \
curl \
memcached \
nginx \
nginx-mod-http-brotli \
nginx-mod-http-dav-ext \
nginx-mod-http-echo \
nginx-mod-http-fancyindex \
nginx-mod-http-geoip \
nginx-mod-http-geoip2 \
nginx-mod-http-headers-more \
nginx-mod-http-image-filter \
nginx-mod-http-lua \
nginx-mod-http-lua-upstream \
nginx-mod-http-nchan \
nginx-mod-http-perl \
nginx-mod-http-redis2 \
@ -76,7 +76,7 @@ RUN \
echo "**** configure nginx ****" && \
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' \
's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \
/defaults/nginx.conf
# add local files

6
Dockerfile.armhf
View File

@ -15,14 +15,14 @@ RUN \
curl \
memcached \
nginx \
nginx-mod-http-brotli \
nginx-mod-http-dav-ext \
nginx-mod-http-echo \
nginx-mod-http-fancyindex \
nginx-mod-http-geoip \
nginx-mod-http-geoip2 \
nginx-mod-http-headers-more \
nginx-mod-http-image-filter \
nginx-mod-http-lua \
nginx-mod-http-lua-upstream \
nginx-mod-http-nchan \
nginx-mod-http-perl \
nginx-mod-http-redis2 \
@ -76,7 +76,7 @@ RUN \
echo "**** configure nginx ****" && \
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' \
's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \
/defaults/nginx.conf
# add local files

1
README.md
View File

@ -223,6 +223,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **09.02.21:** - Rebasing to alpine 3.13. Add nginx mods brotli and dav-ext. Remove nginx mods lua and lua-upstream (due to regression over the last couple of years).
* **08.09.20:** - Add php7-xsl.
* **01.06.20:** - Rebasing to alpine 3.12.
* **18.04.20:** - Fix unwanted shutdown of the container.

2
readme-vars.yml
View File

@ -40,7 +40,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
- { date: "09.02.21:", desc: "Rebasing to alpine 3.13. Add nginx mods brotli and dav-ext. Remove nginx mods lua and lua-upstream (due to regression over the last couple of years)." }
- { date: "08.09.20:", desc: "Add php7-xsl." }
- { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
- { date: "18.04.20:", desc: "Fix unwanted shutdown of the container." }

6
root/etc/cont-init.d/40-config
View File

@ -4,6 +4,12 @@
mkdir -p \
/config/geoip2db
# remove lua bits from nginx.conf if not done before
if ! grep -q '#Removed lua' nginx.conf; then
echo "Removing lua specific info from nginx.conf"
sed -i 's|\tlua_load_resty_core off;|\t#Removed lua. Do not remove this comment|g' nginx.conf
fi
# create GeoIP2 folder symlink
[[ -d /var/lib/libmaxminddb ]] && [[ ! -L /var/lib/libmaxminddb ]] && \
rm -rf /var/lib/libmaxminddb