From 3e1370a3ef7a70a6a141a37c67ae02acfda49bb6 Mon Sep 17 00:00:00 2001
From: Rafael Raab <53948988+rraab-dev@users.noreply.github.com>
Date: Sat, 29 May 2021 16:42:20 +0200
Subject: [PATCH 1/5] Added Freetype and JPEG support to GD PHP8

---
 8.0.Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/8.0.Dockerfile b/8.0.Dockerfile
index b640519..50e5362 100644
--- a/8.0.Dockerfile
+++ b/8.0.Dockerfile
@@ -22,12 +22,14 @@ RUN \
     autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \
       icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \
       libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \
+      freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \
     # prod deps
     && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 librdkafka libxml2-utils libpq \
       libmemcached libssh2 libevent libev libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \
 #
 # php extensions
   && docker-php-source extract \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \
     && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \
     && pecl install $PECL_EXTENSIONS > /dev/null \
     && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \

From 6db4e240345f7f56af8a21c8187da36a80c7f715 Mon Sep 17 00:00:00 2001
From: Rafael Raab <53948988+rraab-dev@users.noreply.github.com>
Date: Sat, 29 May 2021 16:45:09 +0200
Subject: [PATCH 2/5] Added Freetype and JPEG Support to PHP8-alp3.13

---
 8.0-alp3.13.Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile
index cef1047..705c7c4 100644
--- a/8.0-alp3.13.Dockerfile
+++ b/8.0-alp3.13.Dockerfile
@@ -22,12 +22,14 @@ RUN \
     autoconf g++ file re2c make zlib-dev libtool aspell-dev pcre-dev libxml2-dev bzip2-dev libzip-dev \
       icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \
       libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev libxslt-dev \
+      freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \
     # prod deps
     && apk add --no-cache aspell gettext gnu-libiconv grpc icu imagemagick imap-dev libzip libbz2 libxml2-utils libpq \
       libmemcached libssh2 libevent libev librdkafka libxslt linux-headers lua openldap openldap-back-mdb tidyhtml yaml zlib \
 #
 # php extensions
   && docker-php-source extract \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \
     && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \
     && pecl install $PECL_EXTENSIONS > /dev/null \
     && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \

From 44806a9f2b37bbe38e8989333bd8fe45a0a497c2 Mon Sep 17 00:00:00 2001
From: Rafael Raab <53948988+rraab-dev@users.noreply.github.com>
Date: Sat, 29 May 2021 16:49:57 +0200
Subject: [PATCH 3/5] Added Freetype and JPEG Support to PHP7.4

---
 7.4.Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/7.4.Dockerfile b/7.4.Dockerfile
index 14d6415..7a2eaa4 100644
--- a/7.4.Dockerfile
+++ b/7.4.Dockerfile
@@ -23,6 +23,7 @@ RUN \
     autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \
       icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \
       libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \
+      freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \
     # prod deps
     && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \
       libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka linux-headers lua zlib \
@@ -45,6 +46,7 @@ RUN \
       && tar xzf zephir_parser.tar.gz \
       && rm -f zephir_parser.tar.gz \
       && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \
     && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \
     && cd /usr/local/etc/php/conf.d/ \
       && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \

From a56a14d642324fb89d5d09ed4d4d352fa1890248 Mon Sep 17 00:00:00 2001
From: Rafael Raab <53948988+rraab-dev@users.noreply.github.com>
Date: Sat, 29 May 2021 16:52:37 +0200
Subject: [PATCH 4/5] Added Freetype and JPEG Support to PHP7.4-alp3.13

---
 7.4-alp3.13.Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile
index cfcfd44..e256686 100644
--- a/7.4-alp3.13.Dockerfile
+++ b/7.4-alp3.13.Dockerfile
@@ -22,6 +22,7 @@ RUN \
     autoconf g++ file re2c make zlib-dev libtool pcre-dev libxml2-dev bzip2-dev libzip-dev \
       icu-dev gettext-dev imagemagick-dev openldap-dev libpng-dev gmp-dev yaml-dev postgresql-dev \
       libxml2-dev tidyhtml-dev libmemcached-dev libssh2-dev libevent-dev libev-dev librdkafka-dev lua-dev \
+      freetype-dev jpeg-dev libjpeg-turbo-dev oniguruma-dev \
     # prod deps
     && apk add --no-cache icu gettext gnu-libiconv grpc imagemagick libzip libbz2 libxml2-utils openldap-back-mdb openldap yaml \
       libpq tidyhtml imap-dev libmemcached libssh2 libevent libev librdkafka linux-headers lua zlib \
@@ -44,6 +45,7 @@ RUN \
       && tar xzf zephir_parser.tar.gz \
       && rm -f zephir_parser.tar.gz \
       && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \
     && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \
     && cd /usr/local/etc/php/conf.d/ \
       && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \

From bb738fdd23e4cb6550023daa205e5bc3c276a5e5 Mon Sep 17 00:00:00 2001
From: Jitendra Adhikari <jiten.adhikary@gmail.com>
Date: Sun, 30 May 2021 11:50:42 +0700
Subject: [PATCH 5/5] fix(*): bump swoole version, disable async

---
 7.4-alp3.13.Dockerfile | 8 ++++----
 7.4.Dockerfile         | 8 ++++----
 8.0-alp3.13.Dockerfile | 9 +++++----
 8.0.Dockerfile         | 9 +++++----
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/7.4-alp3.13.Dockerfile b/7.4-alp3.13.Dockerfile
index e256686..f024a02 100644
--- a/7.4-alp3.13.Dockerfile
+++ b/7.4-alp3.13.Dockerfile
@@ -6,7 +6,7 @@ ENV \
   XHPROF_VERSION=5.0.1\
   ZEPHIR_VERSION=1.3.3 \
   PHALCON_VERSION=4.0.0 \
-  SWOOLE_VERSION=4.6.6 \
+  SWOOLE_VERSION=4.6.7 \
   SWOOLE_ASYNC_VERSION=4.5.5 \
   LD_PRELOAD=/usr/lib/preloadable_libiconv.so \
   PECL_EXTENSIONS="apcu ast ds ev grpc hrtime igbinary imagick lzf lua mongodb msgpack oauth pcov psr rdkafka redis \
@@ -30,7 +30,7 @@ RUN \
 # php extensions
   && docker-php-source extract \
     && pecl channel-update pecl.php.net \
-    && pecl install $PECL_EXTENSIONS \
+    && pecl install $PECL_EXTENSIONS > /dev/null \
     && cd /usr/src/php/ext/ \
     && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \
     && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \
@@ -38,7 +38,7 @@ RUN \
     && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \
       && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \
       && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \
-      && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \
+      && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION \
       && rm -f swoole.tar.gz swoole_async.tar.gz \
     # zephir_parser
     && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \
@@ -46,7 +46,7 @@ RUN \
       && rm -f zephir_parser.tar.gz \
       && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \
     && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \
-    && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \
+    && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE  > /dev/null \
     && cd /usr/local/etc/php/conf.d/ \
       && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \
     && pecl clear-cache \
diff --git a/7.4.Dockerfile b/7.4.Dockerfile
index 7a2eaa4..915c058 100644
--- a/7.4.Dockerfile
+++ b/7.4.Dockerfile
@@ -6,7 +6,7 @@ ENV \
   XHPROF_VERSION=5.0.1\
   ZEPHIR_VERSION=1.3.3 \
   PHALCON_VERSION=4.0.0 \
-  SWOOLE_VERSION=4.6.6 \
+  SWOOLE_VERSION=4.6.7 \
   SWOOLE_ASYNC_VERSION=4.5.5 \
   MAXMIND_VERSION=1.4.2 \
   LD_PRELOAD=/usr/lib/preloadable_libiconv.so \
@@ -31,7 +31,7 @@ RUN \
 # php extensions
   && docker-php-source extract \
     && pecl channel-update pecl.php.net \
-    && pecl install $PECL_EXTENSIONS \
+    && pecl install $PECL_EXTENSIONS > /dev/null \
     && cd /usr/src/php/ext/ \
     && for BUNDLE_EXT in $PECL_BUNDLE; do pecl bundle $BUNDLE_EXT; done \
     && docker-php-ext-enable $(echo $PECL_EXTENSIONS | sed -E 's/\-[^ ]+//g') opcache \
@@ -39,7 +39,7 @@ RUN \
     && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \
       && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \
       && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \
-      && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \
+      && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION \
       && rm -f swoole.tar.gz swoole_async.tar.gz \
     # zephir_parser
     && curl -sSLo zephir_parser.tar.gz https://github.com/phalcon/php-zephir-parser/archive/v$ZEPHIR_VERSION.tar.gz \
@@ -47,7 +47,7 @@ RUN \
       && rm -f zephir_parser.tar.gz \
       && mv php-zephir-parser-$ZEPHIR_VERSION zephir_parser \
     && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \
-    && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE \
+    && docker-php-ext-install -j "$(nproc)" $PHP_EXTENSIONS $PECL_BUNDLE > /dev/null \
     && cd /usr/local/etc/php/conf.d/ \
       && mv docker-php-ext-event.ini docker-php-ext-zevent.ini \
     && pecl clear-cache \
diff --git a/8.0-alp3.13.Dockerfile b/8.0-alp3.13.Dockerfile
index 705c7c4..85c87fa 100644
--- a/8.0-alp3.13.Dockerfile
+++ b/8.0-alp3.13.Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Jitendra Adhikari <jiten.adhikary@gmail.com>
 
 ENV \
   MAXMIND_VERSION=1.4.2 \
-  SWOOLE_VERSION=4.6.6 \
+  SWOOLE_VERSION=4.6.7 \
   SWOOLE_ASYNC_VERSION=4.5.5 \
   LD_PRELOAD=/usr/lib/preloadable_libiconv.so \
   PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \
@@ -29,6 +29,7 @@ RUN \
 #
 # php extensions
   && docker-php-source extract \
+    && pecl channel-update pecl.php.net \
     && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \
     && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \
     && pecl install $PECL_EXTENSIONS > /dev/null \
@@ -36,9 +37,9 @@ RUN \
     && cd /usr/src/php/ext/ \
     # swoole
     && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \
-      && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \
-      && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \
-      && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \
+      && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \
+    # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \
+    #  && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \
       && rm -f swoole.tar.gz swoole_async.tar.gz \
     && docker-php-ext-install -j "$(nproc)" swoole \
   && docker-php-source delete \
diff --git a/8.0.Dockerfile b/8.0.Dockerfile
index 50e5362..0afbd27 100644
--- a/8.0.Dockerfile
+++ b/8.0.Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Jitendra Adhikari <jiten.adhikary@gmail.com>
 
 ENV \
   MAXMIND_VERSION=1.4.2 \
-  SWOOLE_VERSION=4.6.6 \
+  SWOOLE_VERSION=4.6.7 \
   SWOOLE_ASYNC_VERSION=4.5.5 \
   LD_PRELOAD=/usr/lib/preloadable_libiconv.so \
   PECL_EXTENSIONS_FUTURE="ev event hrtime imagick lua ssh2-1.2 xlswriter yaf" \
@@ -29,6 +29,7 @@ RUN \
 #
 # php extensions
   && docker-php-source extract \
+    && pecl channel-update pecl.php.net \
     && docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd \
     && docker-php-ext-install $PHP_EXTENSIONS > /dev/null \
     && pecl install $PECL_EXTENSIONS > /dev/null \
@@ -36,9 +37,9 @@ RUN \
     && cd /usr/src/php/ext/ \
     # swoole
     && curl -sSLo swoole.tar.gz https://github.com/swoole/swoole-src/archive/v$SWOOLE_VERSION.tar.gz \
-      && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \
-      && tar xzf swoole.tar.gz && tar xzf swoole_async.tar.gz \
-      && mv swoole-src-$SWOOLE_VERSION swoole && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \
+      && tar xzf swoole.tar.gz && mv swoole-src-$SWOOLE_VERSION swoole \
+    # && curl -sSLo swoole_async.tar.gz https://github.com/swoole/ext-async/archive/v$SWOOLE_ASYNC_VERSION.tar.gz \
+    #  && tar xzf swoole_async.tar.gz && mv ext-async-$SWOOLE_ASYNC_VERSION swoole_async \
       && rm -f swoole.tar.gz swoole_async.tar.gz \
     && docker-php-ext-install -j "$(nproc)" swoole \
   && docker-php-source delete \