PHP8 Image working

dbpolito · dbpolito · commit bed640f4ad91 · 2020-12-08T16:17:15.000-03:00
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [7.1, 7.2, 7.3, 7.4]
+        version: [7.1, 7.2, 7.3, 7.4, 8.0]
         type: ['', '-prod']
 
     steps:
diff --git a/7.1-prod/Dockerfile b/7.1-prod/Dockerfile
@@ -52,7 +52,8 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis  \
+    && pecl install imagick \
+    && pecl install redis  \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
diff --git a/7.1/Dockerfile b/7.1/Dockerfile
@@ -52,7 +52,8 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis xdebug \
+    && pecl install imagick \
+    && pecl install redis xdebug \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
diff --git a/7.2-prod/Dockerfile b/7.2-prod/Dockerfile
@@ -52,7 +52,8 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis  \
+    && pecl install imagick \
+    && pecl install redis  \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
diff --git a/7.2/Dockerfile b/7.2/Dockerfile
@@ -52,7 +52,8 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis xdebug \
+    && pecl install imagick \
+    && pecl install redis xdebug \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
diff --git a/7.3-prod/Dockerfile b/7.3-prod/Dockerfile
@@ -52,7 +52,8 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis  \
+    && pecl install imagick \
+    && pecl install redis  \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
diff --git a/7.3/Dockerfile b/7.3/Dockerfile
@@ -52,7 +52,8 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis xdebug \
+    && pecl install imagick \
+    && pecl install redis xdebug \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
diff --git a/7.4-prod/Dockerfile b/7.4-prod/Dockerfile
@@ -49,7 +49,8 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis  \
+    && pecl install imagick \
+    && pecl install redis  \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -49,7 +49,8 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis xdebug \
+    && pecl install imagick \
+    && pecl install redis xdebug \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
diff --git a/8.0-prod/Dockerfile b/8.0-prod/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-rc-fpm-alpine
+FROM php:8.0-fpm-alpine
 
 ENV ASUSER= \
     UID= \
@@ -49,7 +49,16 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis  \
+    # Temporarily building for PHP 8.0: https://github.com/Imagick/imagick/issues/358
+    && git clone https://github.com/Imagick/imagick \
+    && cd imagick \
+    && phpize \
+    && ./configure \
+    && make \
+    && make install \
+    && cd ../ \
+    && rm -rf imagick \
+    && pecl install redis  \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-rc-fpm-alpine
+FROM php:8.0-fpm-alpine
 
 ENV ASUSER= \
     UID= \
@@ -49,7 +49,16 @@ RUN adduser -D -u 1337 kool \
         soap \
         xml \
         zip \
-    && pecl install imagick redis xdebug \
+    # Temporarily building for PHP 8.0: https://github.com/Imagick/imagick/issues/358
+    && git clone https://github.com/Imagick/imagick \
+    && cd imagick \
+    && phpize \
+    && ./configure \
+    && make \
+    && make install \
+    && cd ../ \
+    && rm -rf imagick \
+    && pecl install redis xdebug \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
diff --git a/fwd-template.json b/fwd-template.json
@@ -436,7 +436,7 @@
         {
             "name": "8.0",
             "data": {
-                "from": "php:8.0-rc-fpm-alpine",
+                "from": "php:8.0-fpm-alpine",
                 "prod": false,
                 "nginx": false,
                 "version": "8.0"
@@ -463,7 +463,7 @@
         {
             "name": "8.0-prod",
             "data": {
-                "from": "php:8.0-rc-fpm-alpine",
+                "from": "php:8.0-fpm-alpine",
                 "prod": true,
                 "nginx": false,
                 "version": "8.0"
diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php
@@ -61,7 +61,20 @@
         soap \
         xml \
         zip \
-    && pecl install imagick redis {{ ! $prod ? 'xdebug' : '' }} \
+@if (version_compare($version, '8.0', '>='))
+    # Temporarily building for PHP 8.0: https://github.com/Imagick/imagick/issues/358
+    && git clone https://github.com/Imagick/imagick \
+    && cd imagick \
+    && phpize \
+    && ./configure \
+    && make \
+    && make install \
+    && cd ../ \
+    && rm -rf imagick \
+@else
+    && pecl install imagick \
+@endif
+    && pecl install redis {{ ! $prod ? 'xdebug' : '' }} \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
     && cp "/usr/local/etc/php/php.ini-{{ $prod ? 'production' : 'development' }}" "/usr/local/etc/php/php.ini" \
