File tree 4 files changed +15
-6
lines changed
4 files changed +15
-6
lines changed Original file line number Diff line number Diff line change @@ -88,7 +88,7 @@ RUN set -xe \
88
88
&& docker-php-ext-enable igbinary \
89
89
\
90
90
# Install redis (manualy build in order to be able to enable igbinary)
91
- && for i in $(seq 1 3); do pecl install -o --nobuild redis && s=0 && break || s=$? && sleep 1; done; (exit $s) \
91
+ && for i in $(seq 1 3); do pecl install -o --nobuild " redis-6.0.2" && s=0 && break || s=$? && sleep 1; done; (exit $s) \
92
92
&& cd "$(pecl config-get temp_dir)/redis" \
93
93
&& phpize \
94
94
&& ./configure --enable-redis-igbinary \
Original file line number Diff line number Diff line change @@ -79,9 +79,18 @@ RUN set -xe \
79
79
&& docker-php-ext-enable opcache \
80
80
&& cp /usr/src/php/php.ini-production ${PHP_INI_DIR}/php.ini \
81
81
\
82
- # Install imagemagick
83
- && for i in $(seq 1 3); do pecl install -o imagick && s=0 && break || s=$? && sleep 1; done; (exit $s) \
84
- && docker-php-ext-enable imagick \
82
+ # Imagick is installed from the archive because regular installation fails
83
+ # See: https://github.com/Imagick/imagick/issues/643#issuecomment-1834361716
84
+ && curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
85
+ && tar --strip-components=1 -xf /tmp/imagick.tar.gz \
86
+ && phpize \
87
+ && ./configure \
88
+ && make \
89
+ && make install \
90
+ && echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
91
+ && rm -rf /tmp/* \
92
+ # <<< End of Imagick installation
93
+
85
94
# Install xdebug
86
95
&& for i in $(seq 1 3); do echo yes | pecl install -o "xdebug" && s=0 && break || s=$? && sleep 1; done; (exit $s) \
87
96
# Install blackfire: https://blackfire.io/docs/integrations/docker
Original file line number Diff line number Diff line change 100
100
RewriteRule ^/(css|js|fonts?)/.*\.(css|js|otf|eot|ttf|svg|woff) - [L]
101
101
102
102
# Prevent access to website with direct usage of index.php in URL
103
- RewriteRule ^/([^/]+/)?index\.php([/?#]|$) - [R=404,L]
103
+ RewriteRule ^/([^/]+/)* ?index\.php([/?#]|$) - [R=404,L]
104
104
105
105
RewriteRule .* /index.php
106
106
</IfModule>
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ rewrite "^/build/(.*)" "/build/$1" break;
19
19
rewrite "^/assets/(.*)" "/assets/$1" break;
20
20
21
21
# Prevent access to website with direct usage of index.php in URL
22
- if ($request_uri ~ "^/([^/]+/)?index\.php([/?#]|$)") {
22
+ if ($request_uri ~ "^/([^/]+/)* ?index\.php([/?#]|$)") {
23
23
return 404;
24
24
}
25
25
You can’t perform that action at this time.
0 commit comments