Merge pull request #115 from kool-dev/patch-imagick

fabriciojs · web-flow · commit 4b9682fa4063 · 2025-10-16T11:01:42.000-03:00
Simplify Imagick install
diff --git a/8.0-nginx-prod/default.tmpl b/8.0-nginx-prod/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.0-nginx/default.tmpl b/8.0-nginx/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.0-prod/Dockerfile b/8.0-prod/Dockerfile
@@ -28,6 +28,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -60,7 +61,6 @@ RUN adduser -D -u 1337 kool \
     && pecl install imagick \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -29,6 +29,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -62,7 +63,6 @@ RUN adduser -D -u 1337 kool \
     && pecl install imagick \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/8.1-nginx-prod/default.tmpl b/8.1-nginx-prod/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.1-nginx/default.tmpl b/8.1-nginx/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.1-prod/Dockerfile b/8.1-prod/Dockerfile
@@ -28,6 +28,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -60,7 +61,6 @@ RUN adduser -D -u 1337 kool \
     && pecl install imagick \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -29,6 +29,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -62,7 +63,6 @@ RUN adduser -D -u 1337 kool \
     && pecl install imagick \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/8.2-nginx-prod/default.tmpl b/8.2-nginx-prod/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.2-nginx/default.tmpl b/8.2-nginx/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.2-prod/Dockerfile b/8.2-prod/Dockerfile
@@ -28,6 +28,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -60,7 +61,6 @@ RUN adduser -D -u 1337 kool \
     && pecl install imagick \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -29,6 +29,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -62,7 +63,6 @@ RUN adduser -D -u 1337 kool \
     && pecl install imagick \
     && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/8.3-nginx-prod/default.tmpl b/8.3-nginx-prod/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.3-nginx/default.tmpl b/8.3-nginx/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.3-prod/Dockerfile b/8.3-prod/Dockerfile
@@ -28,6 +28,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -57,16 +58,9 @@ RUN adduser -D -u 1337 kool \
         mysqli \
         ftp \
     && pecl install redis \
-    && mkdir /tmp/imagick && cd /tmp/imagick \
-    && curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
-    && tar --strip-components=1 -xf /tmp/imagick.tar.gz \
-    && phpize \
-    && ./configure --with-webp=yes \
-    && make \
-    && make install \
-    && echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
+    && pecl install imagick \
+    && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/8.3/Dockerfile b/8.3/Dockerfile
@@ -29,6 +29,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -59,16 +60,9 @@ RUN adduser -D -u 1337 kool \
     && pecl install redis \
     && pecl install xdebug \
     && pecl install pcov && docker-php-ext-enable pcov \
-    && mkdir /tmp/imagick && cd /tmp/imagick \
-    && curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
-    && tar --strip-components=1 -xf /tmp/imagick.tar.gz \
-    && phpize \
-    && ./configure --with-webp=yes \
-    && make \
-    && make install \
-    && echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
+    && pecl install imagick \
+    && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/8.4-nginx-prod/default.tmpl b/8.4-nginx-prod/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.4-nginx/default.tmpl b/8.4-nginx/default.tmpl
@@ -20,9 +20,7 @@ server {
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {
diff --git a/8.4-prod/Dockerfile b/8.4-prod/Dockerfile
@@ -28,6 +28,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -57,8 +58,9 @@ RUN adduser -D -u 1337 kool \
         mysqli \
         ftp \
     && pecl install redis \
+    && pecl install imagick \
+    && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/8.4/Dockerfile b/8.4/Dockerfile
@@ -29,6 +29,7 @@ RUN adduser -D -u 1337 kool \
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -59,8 +60,9 @@ RUN adduser -D -u 1337 kool \
     && pecl install redis \
     && pecl install xdebug \
     && pecl install pcov && docker-php-ext-enable pcov \
+    && pecl install imagick \
+    && docker-php-ext-enable imagick \
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php
@@ -31,6 +31,7 @@
         jpegoptim optipng pngquant gifsicle libldap \
         libpq less \
     # build-deps
+    && cp "/usr/local/etc/php/php.ini-{{ $prod ? 'production' : 'development' }}" "/usr/local/etc/php/php.ini" \
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
         freetype-dev libpng-dev libjpeg-turbo-dev \
         icu-dev libedit-dev libxml2-dev \
@@ -73,24 +74,9 @@
     && pecl install {{ version_compare($version, '8', '>=') ? 'xdebug' : 'xdebug-3.1.6' }} \
     && pecl install pcov && docker-php-ext-enable pcov \
 @endif
-@if (version_compare($version, '8.2', '<='))
     && pecl install imagick \
     && docker-php-ext-enable imagick \
-@else
-@if (version_compare($version, '8.4', '=='))
-@else
-    && mkdir /tmp/imagick && cd /tmp/imagick \
-    && curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
-    && tar --strip-components=1 -xf /tmp/imagick.tar.gz \
-    && phpize \
-    && ./configure --with-webp=yes \
-    && make \
-    && make install \
-    && echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
-@endif
-@endif
     && docker-php-ext-enable redis \
-    && cp "/usr/local/etc/php/php.ini-{{ $prod ? 'production' : 'development' }}" "/usr/local/etc/php/php.ini" \
     # composer
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
diff --git a/template/default-tmpl.blade.php b/template/default-tmpl.blade.php
@@ -20,9 +20,7 @@
     error_page 404 /index.php;
 
     location / {
-        try_files $uri $uri/ /@{{ .Env.NGINX_INDEX }}?$query_string;
-
-        add_header X-Served-By kool.dev;
+        try_files $uri /@{{ .Env.NGINX_INDEX }}?$query_string;
     }
 
     location ~ \.php$ {

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,7 @@ server {`
`20`	`20`	`error_page 404 /index.php;`
`21`	`21`
`22`	`22`	`location / {`
`23`		`- try_files $uri $uri/ /{{ .Env.NGINX_INDEX }}?$query_string;`
`24`		`-`
`25`		`- add_header X-Served-By kool.dev;`
	`23`	`+ try_files $uri /{{ .Env.NGINX_INDEX }}?$query_string;`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`location ~ \.php$ {`