Merge pull request #35 from rraab-dev/main

adhocore · May 30, 2021 · 1694c8d · 1694c8d
2 parents 7eb8c14 + bdcfb2f
commit 1694c8d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git 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 \

diff --git 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 \

diff --git 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 \

diff --git 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 \