From 56e7b78b4d282424070fc83cf114c201c91f74a0 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 12 Feb 2019 00:12:19 +0100 Subject: [PATCH 1/2] new storage directory to exclude --- .docker-files/upgrade.exclude | 3 ++- 2019.01/apache/upgrade.exclude | 3 ++- 2019.01/fpm-alpine/upgrade.exclude | 3 ++- 2019.01/fpm/upgrade.exclude | 3 ++- 2019.03-dev/apache/upgrade.exclude | 3 ++- 2019.03-dev/fpm-alpine/upgrade.exclude | 3 ++- 2019.03-dev/fpm/upgrade.exclude | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.docker-files/upgrade.exclude b/.docker-files/upgrade.exclude index b1c6486..17b8b51 100644 --- a/.docker-files/upgrade.exclude +++ b/.docker-files/upgrade.exclude @@ -7,4 +7,5 @@ /config/local.ini.php /config/addon.ini.php /config/local.config.php -/config/addon.config.php \ No newline at end of file +/config/addon.config.php +/storage/ \ No newline at end of file diff --git a/2019.01/apache/upgrade.exclude b/2019.01/apache/upgrade.exclude index b1c6486..17b8b51 100644 --- a/2019.01/apache/upgrade.exclude +++ b/2019.01/apache/upgrade.exclude @@ -7,4 +7,5 @@ /config/local.ini.php /config/addon.ini.php /config/local.config.php -/config/addon.config.php \ No newline at end of file +/config/addon.config.php +/storage/ \ No newline at end of file diff --git a/2019.01/fpm-alpine/upgrade.exclude b/2019.01/fpm-alpine/upgrade.exclude index b1c6486..17b8b51 100644 --- a/2019.01/fpm-alpine/upgrade.exclude +++ b/2019.01/fpm-alpine/upgrade.exclude @@ -7,4 +7,5 @@ /config/local.ini.php /config/addon.ini.php /config/local.config.php -/config/addon.config.php \ No newline at end of file +/config/addon.config.php +/storage/ \ No newline at end of file diff --git a/2019.01/fpm/upgrade.exclude b/2019.01/fpm/upgrade.exclude index b1c6486..17b8b51 100644 --- a/2019.01/fpm/upgrade.exclude +++ b/2019.01/fpm/upgrade.exclude @@ -7,4 +7,5 @@ /config/local.ini.php /config/addon.ini.php /config/local.config.php -/config/addon.config.php \ No newline at end of file +/config/addon.config.php +/storage/ \ No newline at end of file diff --git a/2019.03-dev/apache/upgrade.exclude b/2019.03-dev/apache/upgrade.exclude index b1c6486..17b8b51 100644 --- a/2019.03-dev/apache/upgrade.exclude +++ b/2019.03-dev/apache/upgrade.exclude @@ -7,4 +7,5 @@ /config/local.ini.php /config/addon.ini.php /config/local.config.php -/config/addon.config.php \ No newline at end of file +/config/addon.config.php +/storage/ \ No newline at end of file diff --git a/2019.03-dev/fpm-alpine/upgrade.exclude b/2019.03-dev/fpm-alpine/upgrade.exclude index b1c6486..17b8b51 100644 --- a/2019.03-dev/fpm-alpine/upgrade.exclude +++ b/2019.03-dev/fpm-alpine/upgrade.exclude @@ -7,4 +7,5 @@ /config/local.ini.php /config/addon.ini.php /config/local.config.php -/config/addon.config.php \ No newline at end of file +/config/addon.config.php +/storage/ \ No newline at end of file diff --git a/2019.03-dev/fpm/upgrade.exclude b/2019.03-dev/fpm/upgrade.exclude index b1c6486..17b8b51 100644 --- a/2019.03-dev/fpm/upgrade.exclude +++ b/2019.03-dev/fpm/upgrade.exclude @@ -7,4 +7,5 @@ /config/local.ini.php /config/addon.ini.php /config/local.config.php -/config/addon.config.php \ No newline at end of file +/config/addon.config.php +/storage/ \ No newline at end of file From 0809143643b617b042aac695b0d804a1fffe0280 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 12 Feb 2019 00:41:40 +0100 Subject: [PATCH 2/2] replace libressl with openssl --- 2019.01/fpm-alpine/Dockerfile | 4 ++-- 2019.03-dev/fpm-alpine/Dockerfile | 4 ++-- Dockerfile-alpine.template | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2019.01/fpm-alpine/Dockerfile b/2019.01/fpm-alpine/Dockerfile index 8949e5c..3d6b736 100644 --- a/2019.01/fpm-alpine/Dockerfile +++ b/2019.01/fpm-alpine/Dockerfile @@ -21,8 +21,8 @@ RUN set -ex; \ autoconf \ g++ \ make \ - libressl \ - libressl-dev \ + openssl \ + openssl-dev \ libpng \ libpng-dev \ libjpeg-turbo-dev \ diff --git a/2019.03-dev/fpm-alpine/Dockerfile b/2019.03-dev/fpm-alpine/Dockerfile index 1201e21..751b985 100644 --- a/2019.03-dev/fpm-alpine/Dockerfile +++ b/2019.03-dev/fpm-alpine/Dockerfile @@ -21,8 +21,8 @@ RUN set -ex; \ autoconf \ g++ \ make \ - libressl \ - libressl-dev \ + openssl \ + openssl-dev \ libpng \ libpng-dev \ libjpeg-turbo-dev \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 85c4052..f1cfe2f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -20,8 +20,8 @@ RUN set -ex; \ autoconf \ g++ \ make \ - libressl \ - libressl-dev \ + openssl \ + openssl-dev \ libpng \ libpng-dev \ libjpeg-turbo-dev \