From eaa28e4be10e6daa7cdff69ff6c7b147bea6b688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Armando=20L=C3=BCscher?= Date: Sun, 19 Apr 2020 00:31:25 +0200 Subject: [PATCH 1/2] Make fpm and Apache start scripts executable. Fixes #2121 --- contrib/docker/start.apache.sh | 0 contrib/docker/start.fpm.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 contrib/docker/start.apache.sh mode change 100644 => 100755 contrib/docker/start.fpm.sh diff --git a/contrib/docker/start.apache.sh b/contrib/docker/start.apache.sh old mode 100644 new mode 100755 diff --git a/contrib/docker/start.fpm.sh b/contrib/docker/start.fpm.sh old mode 100644 new mode 100755 From 3e5f3e3d86d659640a59e3ca61f2f35eca668840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Armando=20L=C3=BCscher?= Date: Sat, 18 Apr 2020 14:17:28 +0200 Subject: [PATCH 2/2] Remove quotes for docker-php-ext-install commands. --- contrib/docker/Dockerfile.apache | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache index b9e88ab0f..fb13a8619 100644 --- a/contrib/docker/Dockerfile.apache +++ b/contrib/docker/Dockerfile.apache @@ -58,7 +58,7 @@ RUN docker-php-ext-configure gd \ --with-jpeg \ --with-webp \ --with-xpm -RUN docker-php-ext-install "-j$(nproc) gd" +RUN docker-php-ext-install -j$(nproc) gd #PHP Redis extensions RUN pecl install redis @@ -70,7 +70,7 @@ RUN docker-php-ext-install pdo_mysql pdo_pgsql pdo_sqlite #PHP extensions (dependencies) RUN docker-php-ext-configure intl -RUN docker-php-ext-install "-j$(nproc) intl bcmath zip pcntl exif curl" +RUN docker-php-ext-install -j$(nproc) intl bcmath zip pcntl exif curl #APACHE Bootstrap RUN a2enmod rewrite remoteip \