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

Merge pull request #76 from linuxserver/conf

Browse Source 
Update default conf folder
This commit is contained in:
aptalca 2021-06-24 10:00:12 -04:00 committed by GitHub
commit ae50b5e375
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -81,7 +81,7 @@ RUN \
php7-xsl \
php7-zip && \
echo "**** configure nginx ****" && \
rm -f /etc/nginx/conf.d/default.conf && \
rm -f /etc/nginx/http.d/default.conf && \
sed -i \
's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \
/defaults/nginx.conf

2
Dockerfile.aarch64
View File

@ -81,7 +81,7 @@ RUN \
php7-xsl \
php7-zip && \
echo "**** configure nginx ****" && \
rm -f /etc/nginx/conf.d/default.conf && \
rm -f /etc/nginx/http.d/default.conf && \
sed -i \
's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \
/defaults/nginx.conf

2
Dockerfile.armhf
View File

@ -81,7 +81,7 @@ RUN \
php7-xsl \
php7-zip && \
echo "**** configure nginx ****" && \
rm -f /etc/nginx/conf.d/default.conf && \
rm -f /etc/nginx/http.d/default.conf && \
sed -i \
's|include /config/nginx/site-confs/\*;|include /config/nginx/site-confs/\*;\n\t#Removed lua. Do not remove this comment|g' \
/defaults/nginx.conf

1
README.md
View File

@ -227,6 +227,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **24.06.21:** - Update default nginx conf folder.
* **12.04.21:** - Add php7-gmp and php7-pecl-mailparse.
* **13.02.21:** - Remove php7-pecl-imagick (it now installs the full imagemagick with too much crud). Users can install it via [this docker mod](https://github.com/linuxserver/docker-mods/tree/swag-imagemagick).
* **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).

1
readme-vars.yml
View File

@ -40,6 +40,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "24.06.21:", desc: "Update default nginx conf folder." }
- { date: "12.04.21:", desc: "Add php7-gmp and php7-pecl-mailparse." }
- { date: "13.02.21:", desc: "Remove php7-pecl-imagick (it now installs the full imagemagick with too much crud). Users can install it via [this docker mod](https://github.com/linuxserver/docker-mods/tree/swag-imagemagick)." }
- { 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)." }