diff --git a/Dockerfile b/Dockerfile index 56705ea..09576b5 100644 --- 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 index c3a9b82..f7e601f 100644 --- 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 index 47ee315..cca17d4 100644 --- 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 index 0321d0f..e5b2200 100644 --- 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 index cf86196..9a1cddb 100644 --- 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." }