Merge pull request #304 from linuxserver/default

remove default.conf when nginx is updated in downstream image

Author: CHBMB

Dockerfile

@@ -104,6 +104,8 @@ RUN \
  tar xf \
 	/tmp/proxy.tar.gz -C \
 	/defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github && \
+ echo "**** configure nginx ****" && \
+ rm -f /etc/nginx/conf.d/default.conf && \
  echo "**** cleanup ****" && \
  for cleanfiles in *.pyc *.pyo; \
 	do \

Dockerfile.aarch64

@@ -104,6 +104,8 @@ RUN \
  tar xf \
 	/tmp/proxy.tar.gz -C \
 	/defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github && \
+ echo "**** configure nginx ****" && \
+ rm -f /etc/nginx/conf.d/default.conf && \
  echo "**** cleanup ****" && \
  for cleanfiles in *.pyc *.pyo; \
 	do \

Dockerfile.armhf

@@ -104,6 +104,8 @@ RUN \
  tar xf \
 	/tmp/proxy.tar.gz -C \
 	/defaults/proxy-confs --strip-components=1 --exclude=linux*/.gitattributes --exclude=linux*/.github && \
+ echo "**** configure nginx ****" && \
+ rm -f /etc/nginx/conf.d/default.conf && \
  echo "**** cleanup ****" && \
  for cleanfiles in *.pyc *.pyo; \
 	do \

README.md

@@ -254,6 +254,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **08.05.19:** - Remove default.conf when nginx is upgraded in downstream image.
 * **30.04.19:** - Add php-redis.
 * **12.04.19:** - Rebase aarch64 image to 3.9.
 * **25.03.19:** - Rebase aarch64 image back to 3.8 due to python issues (specifically with fail2ban), switch packages to python 3 on amd64 and armhf, clean up pip/python cache to shrink image size.

readme-vars.yml

@@ -126,6 +126,7 @@ app_setup_nginx_reverse_proxy_block: ""
 
 # changelog
 changelogs:
+  - { date: "08.05.19:", desc: "Remove default.conf when nginx is upgraded in downstream image." }
   - { date: "30.04.19:", desc: "Add php-redis." }
   - { date: "12.04.19:", desc: "Rebase aarch64 image to 3.9." }
   - { date: "25.03.19:", desc: "Rebase aarch64 image back to 3.8 due to python issues (specifically with fail2ban), switch packages to python 3 on amd64 and armhf, clean up pip/python cache to shrink image size." }