Skip to content

Commit d520547

Browse files
KingPinKingPin
authored andcommitted
docker: install imagick and mcrypt via main extension installer
Add imagick and mcrypt to the primary install-php-extensions lists in Dockerfile.v1 and Dockerfile.v2 and comment out the PHPVERSION-based conditional blocks that previously handled version-specific installs. This simplifies extension installation by making imagick/mcrypt unconditional.
1 parent 2ce67ef commit d520547

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

Dockerfile.v1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@ RUN if [ "$BASEOS" = "bullseye" ]; then \
2828
RUN curl -sSLf -o /usr/local/bin/install-php-extensions \
2929
https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions && \
3030
chmod +x /usr/local/bin/install-php-extensions && \
31-
install-php-extensions amqp bcmath bz2 calendar ctype exif intl imap json mbstring ldap mcrypt memcached mongodb mysqli \
32-
opcache pdo_mysql pdo_pgsql pgsql redis snmp soap sockets tidy timezonedb uuid vips xsl yaml zip zstd @composer
31+
install-php-extensions amqp bcmath bz2 calendar ctype exif intl imagick imap json mbstring ldap mcrypt memcached mongodb \
32+
mysqli opcache pdo_mysql pdo_pgsql pgsql redis snmp soap sockets tidy timezonedb uuid vips xsl yaml zip zstd @composer
3333

3434
# Enable Apache rewrite mod, if applicable
3535
RUN if command -v a2enmod; then a2enmod rewrite; fi
3636

37-
# Add mcrypt and imagick based on PHP version
38-
RUN case "$PHPVERSION" in \
39-
7|8.0|8.1|8.2) \
40-
install-php-extensions imagick; \
41-
;; \
42-
8.3) \
43-
install-php-extensions imagick/imagick@master; \
44-
;; \
45-
*) \
46-
;; \
47-
esac
37+
# # Add mcrypt and imagick based on PHP version
38+
# RUN case "$PHPVERSION" in \
39+
# 7|8.0|8.1|8.2) \
40+
# install-php-extensions imagick; \
41+
# ;; \
42+
# 8.3) \
43+
# install-php-extensions imagick/imagick@master; \
44+
# ;; \
45+
# *) \
46+
# ;; \
47+
# esac
4848

4949
# Disable AV1 only in armv7
5050
RUN case $(uname -m) in \

Dockerfile.v2

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN install-php-extensions \
4242
# File operation extensions
4343
zip bz2 \
4444
# Utility extensions
45-
amqp bcmath calendar ctype exif intl imagick imap ldap mbstring \
45+
amqp bcmath calendar ctype exif intl imagick imap ldap mbstring mcrypt \
4646
mongodb snmp tidy timezonedb uuid vips xsl yaml \
4747
# Package manager
4848
@composer
@@ -52,16 +52,16 @@ RUN if command -v a2enmod; then \
5252
a2enmod rewrite headers; \
5353
fi
5454

55-
# Add mcrypt based on PHP version
56-
RUN case "$PHPVERSION" in \
57-
8.0|8.1|8.2|8.3) \
58-
install-php-extensions mcrypt; \
59-
;; \
60-
8.4) \
61-
;; \
62-
*) \
63-
;; \
64-
esac
55+
# # Add mcrypt based on PHP version
56+
# RUN case "$PHPVERSION" in \
57+
# 8.0|8.1|8.2|8.3) \
58+
# install-php-extensions mcrypt; \
59+
# ;; \
60+
# 8.4) \
61+
# ;; \
62+
# *) \
63+
# ;; \
64+
# esac
6565

6666
# Install GD with architecture-specific configuration
6767
RUN case $(uname -m) in \

0 commit comments

Comments
 (0)