Skip to content

Commit a4787f4

Browse files
committed
update templates - imagick simplification
1 parent 126e55c commit a4787f4

File tree

2 files changed

+2
-18
lines changed

2 files changed

+2
-18
lines changed

template/Dockerfile.blade.php

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
jpegoptim optipng pngquant gifsicle libldap \
3232
libpq less \
3333
# build-deps
34+
&& cp "/usr/local/etc/php/php.ini-{{ $prod ? 'production' : 'development' }}" "/usr/local/etc/php/php.ini" \
3435
&& apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
3536
freetype-dev libpng-dev libjpeg-turbo-dev \
3637
icu-dev libedit-dev libxml2-dev \
@@ -73,24 +74,9 @@
7374
&& pecl install {{ version_compare($version, '8', '>=') ? 'xdebug' : 'xdebug-3.1.6' }} \
7475
&& pecl install pcov && docker-php-ext-enable pcov \
7576
@endif
76-
@if (version_compare($version, '8.2', '<='))
7777
&& pecl install imagick \
7878
&& docker-php-ext-enable imagick \
79-
@else
80-
@if (version_compare($version, '8.4', '=='))
81-
@else
82-
&& mkdir /tmp/imagick && cd /tmp/imagick \
83-
&& curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
84-
&& tar --strip-components=1 -xf /tmp/imagick.tar.gz \
85-
&& phpize \
86-
&& ./configure --with-webp=yes \
87-
&& make \
88-
&& make install \
89-
&& echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
90-
@endif
91-
@endif
9279
&& docker-php-ext-enable redis \
93-
&& cp "/usr/local/etc/php/php.ini-{{ $prod ? 'production' : 'development' }}" "/usr/local/etc/php/php.ini" \
9480
# composer
9581
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
9682
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \

template/default-tmpl.blade.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
error_page 404 /index.php;
2121

2222
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;
2624
}
2725

2826
location ~ \.php$ {

0 commit comments

Comments
 (0)