Merge pull request #45 from linuxserver/default

remove default.conf when nginx is updated in downstream image
linuxserver · May 8, 2019 · 2e184e5 · 2e184e5
2 parents 0fd225d + 9416b4c
commit 2e184e5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -59,4 +59,6 @@ RUN \
  php7-tokenizer \
  php7-xml \
  php7-xmlreader \
- php7-zip
+ php7-zip && \
+ echo "**** configure nginx ****" && \
+ rm -f /etc/nginx/conf.d/default.conf
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -59,4 +59,6 @@ RUN \
  php7-tokenizer \
  php7-xml \
  php7-xmlreader \
- php7-zip
+ php7-zip && \
+ echo "**** configure nginx ****" && \
+ rm -f /etc/nginx/conf.d/default.conf
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -59,4 +59,6 @@ RUN \
  php7-tokenizer \
  php7-xml \
  php7-xmlreader \
- php7-zip
+ php7-zip && \
+ echo "**** configure nginx ****" && \
+ rm -f /etc/nginx/conf.d/default.conf
diff --git a/README.md b/README.md
@@ -181,6 +181,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.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **02.03.19:** - Add php intl and posix modules.

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -40,6 +40,7 @@ app_setup_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: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
  - { date: "02.03.19:", desc: "Add php intl and posix modules." }