ignore addon.ini.php when copying a new release

2024-05-23 09:04:58 +02:00 · 2018-10-05 21:20:25 +02:00 · 2018-10-05 21:20:25 +02:00 · 93d514529c
parent b9647b0308
commit 93d514529c
15 changed files with 22 additions and 15 deletions
--- a/2018.09/apache/Dockerfile
+++ b/2018.09/apache/Dockerfile
@ -10,7 +10,7 @@ RUN set -ex; \
        rsync \
        bzip2 \
        git \
-      # mail() support
+# For mail() support
        ssmtp \
    ; \
    rm -rf /var/lib/apt/lists/*;
--- a/2018.09/apache/upgrade.exclude
+++ b/2018.09/apache/upgrade.exclude
@ -5,3 +5,4 @@
 .htaccess
 home.*
 /config/local.ini.php
+/config/addon.ini.php
--- a/2018.09/fpm-alpine/Dockerfile
+++ b/2018.09/fpm-alpine/Dockerfile
@ -7,7 +7,7 @@ RUN set -ex; \
    apk add --no-cache \
        rsync \
        git \
-     # mail() support
+# For mail() support
        ssmtp;

 # install the PHP extensions we need
--- a/2018.09/fpm-alpine/upgrade.exclude
+++ b/2018.09/fpm-alpine/upgrade.exclude
@ -5,3 +5,4 @@
 .htaccess
 home.*
 /config/local.ini.php
+/config/addon.ini.php
--- a/2018.09/fpm/Dockerfile
+++ b/2018.09/fpm/Dockerfile
@ -10,7 +10,7 @@ RUN set -ex; \
        rsync \
        bzip2 \
        git \
-      # mail() support
+# For mail() support
        ssmtp \
    ; \
    rm -rf /var/lib/apt/lists/*;
--- a/2018.09/fpm/upgrade.exclude
+++ b/2018.09/fpm/upgrade.exclude
@ -5,3 +5,4 @@
 .htaccess
 home.*
 /config/local.ini.php
+/config/addon.ini.php
--- a/2018.12-dev/apache/Dockerfile
+++ b/2018.12-dev/apache/Dockerfile
@ -10,7 +10,7 @@ RUN set -ex; \
        rsync \
        bzip2 \
        git \
-      # mail() support
+# For mail() support
        ssmtp \
    ; \
    rm -rf /var/lib/apt/lists/*;
--- a/2018.12-dev/apache/upgrade.exclude
+++ b/2018.12-dev/apache/upgrade.exclude
@ -5,3 +5,4 @@
 .htaccess
 home.*
 /config/local.ini.php
+/config/addon.ini.php
--- a/2018.12-dev/fpm-alpine/Dockerfile
+++ b/2018.12-dev/fpm-alpine/Dockerfile
@ -7,7 +7,7 @@ RUN set -ex; \
    apk add --no-cache \
        rsync \
        git \
-     # mail() support
+# For mail() support
        ssmtp;

 # install the PHP extensions we need
--- a/2018.12-dev/fpm-alpine/upgrade.exclude
+++ b/2018.12-dev/fpm-alpine/upgrade.exclude
@ -5,3 +5,4 @@
 .htaccess
 home.*
 /config/local.ini.php
+/config/addon.ini.php
--- a/2018.12-dev/fpm/Dockerfile
+++ b/2018.12-dev/fpm/Dockerfile
@ -10,7 +10,7 @@ RUN set -ex; \
        rsync \
        bzip2 \
        git \
-      # mail() support
+# For mail() support
        ssmtp \
    ; \
    rm -rf /var/lib/apt/lists/*;
--- a/2018.12-dev/fpm/upgrade.exclude
+++ b/2018.12-dev/fpm/upgrade.exclude
@ -5,3 +5,4 @@
 .htaccess
 home.*
 /config/local.ini.php
+/config/addon.ini.php
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -6,7 +6,7 @@ RUN set -ex; \
    apk add --no-cache \
        rsync \
        git \
-     # mail() support
+# For mail() support
        ssmtp;

 # install the PHP extensions we need
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -9,7 +9,7 @@ RUN set -ex; \
        rsync \
        bzip2 \
        git \
-      # mail() support
+# For mail() support
        ssmtp \
    ; \
    rm -rf /var/lib/apt/lists/*;
--- a/upgrade.exclude
+++ b/upgrade.exclude
@ -5,3 +5,4 @@
 .htaccess
 home.*
 /config/local.ini.php
+/config/addon.ini.php