From 14d3d4723c4f8a05fb5e4fda9073a8cb2b9f9ace Mon Sep 17 00:00:00 2001 From: Vardan Pogosian Date: Thu, 23 May 2019 11:42:07 +0300 Subject: [PATCH 1/9] fix: add index.html, index.htm to nginx default vhost config --- nginx/image-files/etc/nginx/conf.d/default.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/image-files/etc/nginx/conf.d/default.conf b/nginx/image-files/etc/nginx/conf.d/default.conf index cb424bc..734b41f 100644 --- a/nginx/image-files/etc/nginx/conf.d/default.conf +++ b/nginx/image-files/etc/nginx/conf.d/default.conf @@ -10,7 +10,7 @@ server { ssl_certificate_key /etc/nginx/ssl/nginx-selfsigned.key; root /app/web; - index index.php; + index index.html index.htm index.php; location / { # Redirect everything that isn't a real file to index.php @@ -42,4 +42,4 @@ server { location ~ /\.(ht|svn|git) { deny all; } -} \ No newline at end of file +} From 3d2f5ff46ee1afc3c036a0f2298bda007ffc2e5e Mon Sep 17 00:00:00 2001 From: Vardan Pogosian Date: Thu, 23 May 2019 14:02:41 +0300 Subject: [PATCH 2/9] fix: change the order of searching index files --- nginx/image-files/etc/nginx/conf.d/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/image-files/etc/nginx/conf.d/default.conf b/nginx/image-files/etc/nginx/conf.d/default.conf index 734b41f..fc2827e 100644 --- a/nginx/image-files/etc/nginx/conf.d/default.conf +++ b/nginx/image-files/etc/nginx/conf.d/default.conf @@ -10,7 +10,7 @@ server { ssl_certificate_key /etc/nginx/ssl/nginx-selfsigned.key; root /app/web; - index index.html index.htm index.php; + index index.php index.html index.htm; location / { # Redirect everything that isn't a real file to index.php From 15274565d8d5e963ca7024d31f5cedd5bce04d52 Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 19 Jul 2019 11:46:33 +0200 Subject: [PATCH 3/9] fixed mysql client installation --- php/Dockerfile-fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/Dockerfile-fpm b/php/Dockerfile-fpm index f730f11..a034304 100755 --- a/php/Dockerfile-fpm +++ b/php/Dockerfile-fpm @@ -30,7 +30,7 @@ RUN apt-get update && \ libpq-dev \ libpng-dev \ zlib1g-dev \ - mysql-client \ + default-mysql-client \ openssh-client \ libxml2-dev \ nano \ From 20f5ef5a695dfafa7cdfeede36b432009196f92f Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 19 Jul 2019 11:52:26 +0200 Subject: [PATCH 4/9] fixed build --- php/Dockerfile-fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/Dockerfile-fpm b/php/Dockerfile-fpm index a034304..c42ef47 100755 --- a/php/Dockerfile-fpm +++ b/php/Dockerfile-fpm @@ -10,7 +10,6 @@ RUN apt-get update && \ apt-get -y install \ gnupg2 && \ curl -sL https://deb.nodesource.com/setup_6.x | bash - && \ - apt-key update && \ apt-get update && \ apt-get -y install \ g++ \ @@ -36,6 +35,7 @@ RUN apt-get update && \ nano \ linkchecker \ nodejs \ + npm \ --no-install-recommends && \ apt-get clean && \ npm -g install npm@latest && \ From 5914262b9b75f9810892f57ba68ea9c1639479bf Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 19 Jul 2019 12:14:06 +0200 Subject: [PATCH 5/9] fixed build --- php/Dockerfile-fpm | 1 + 1 file changed, 1 insertion(+) diff --git a/php/Dockerfile-fpm b/php/Dockerfile-fpm index c42ef47..787fcce 100755 --- a/php/Dockerfile-fpm +++ b/php/Dockerfile-fpm @@ -28,6 +28,7 @@ RUN apt-get update && \ libmcrypt-dev \ libpq-dev \ libpng-dev \ + libzip-dev \ zlib1g-dev \ default-mysql-client \ openssh-client \ From 8b8a490c3d211da0ac4a8d545f16417364fac9d3 Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 19 Jul 2019 12:18:22 +0200 Subject: [PATCH 6/9] updated README --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e43e115..7558ac6 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,11 @@ Supported tags and respective `Dockerfile` links - `7.x-fpm-x.x-alpine`, `latest-alpine` ([Dockerfile](php/Dockerfile-fpm)) - `7.x-fpm-x.x-alpine-nginx`, `latest-alpine-nginx` ([Dockerfile](nginx/Dockerfile-fpm-alpine-nginx)) -*`latest` images are currently built based on the `release/4.x` branch* +### Branches + +- *`release/4.x` branch builds also `latest` images* +- *`release/5.x` branch is deprectated* +- *`release/6.x` branch uses supervisor instead of forego* :information_source: See repository tags for full version numbers From 204e5ca916868cd5d48e7c3ddb04a5ddaa034f9b Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 19 Jul 2019 12:49:18 +0200 Subject: [PATCH 7/9] switched (back) to Debian stretch --- php/Dockerfile-fpm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/php/Dockerfile-fpm b/php/Dockerfile-fpm index 787fcce..7e223f1 100755 --- a/php/Dockerfile-fpm +++ b/php/Dockerfile-fpm @@ -2,7 +2,7 @@ # ============================================== ARG PHP_BASE_IMAGE_VERSION -FROM php:${PHP_BASE_IMAGE_VERSION}-fpm +FROM php:${PHP_BASE_IMAGE_VERSION}-fpm-stretch # Install system packages for PHP extensions recommended for Yii 2.0 Framework ENV DEBIAN_FRONTEND=noninteractive @@ -65,7 +65,7 @@ RUN docker-php-ext-configure gd \ # Install PECL extensions # see http://stackoverflow.com/a/8154466/291573) for usage of `printf` RUN printf "\n" | pecl install \ - apcu-5.1.3 \ + apcu \ imagick \ mcrypt-1.0.0 && \ docker-php-ext-enable \ @@ -76,7 +76,7 @@ RUN printf "\n" | pecl install \ RUN cd /tmp && \ git clone git://github.com/xdebug/xdebug.git && \ cd xdebug && \ - git checkout 52adff7539109db592d07d3f6c325f6ee2a7669f && \ + git checkout 2.7.2 && \ phpize && \ ./configure --enable-xdebug && \ make && \ From 81fee88aaf8cf2cb080766df6b7598c2a00dbb2b Mon Sep 17 00:00:00 2001 From: Tobias Munk Date: Fri, 19 Jul 2019 13:45:42 +0200 Subject: [PATCH 8/9] :memo: branch, PHP version --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7558ac6..34fb65e 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ Supported tags and respective `Dockerfile` links ### Branches -- *`release/4.x` branch builds also `latest` images* +- *`release/4.x` (PHP 7.2) branch builds also `latest` images* - *`release/5.x` branch is deprectated* -- *`release/6.x` branch uses supervisor instead of forego* +- *`release/6.x` (PHP 7.3) branch uses supervisor instead of forego* :information_source: See repository tags for full version numbers From c1571de1a6b21d61bdf8bef89553eae7fd9e5cd3 Mon Sep 17 00:00:00 2001 From: Pierre Grimaud Date: Sun, 26 Apr 2020 00:04:34 +0200 Subject: [PATCH 9/9] Fix typos --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 34fb65e..5820137 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Supported tags and respective `Dockerfile` links ### Branches - *`release/4.x` (PHP 7.2) branch builds also `latest` images* -- *`release/5.x` branch is deprectated* +- *`release/5.x` branch is deprecated* - *`release/6.x` (PHP 7.3) branch uses supervisor instead of forego* :information_source: See repository tags for full version numbers