Skip to content

Commit 808e2c2

Browse files
committed
Remove enchant-related dependencies from Dockerfiles
Excluded `enchant2` and `php-enchant` dependencies across multiple Dockerfiles. Commented out `yaf` installation and enabling steps in the PECL extensions Dockerfile.
1 parent bcf0669 commit 808e2c2

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

tests/DockerImages/7.3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM php:7.3-alpine
33
RUN set -eux; \
44
apk add --no-cache --virtual .build-deps \
55
bash gcc g++ make autoconf pkgconfig git \
6-
libmcrypt-dev imap-dev php7-imap enchant2 php8-enchant bzip2-dev gettext-dev libxml2-dev php7-dev php7-gd icu-dev \
6+
libmcrypt-dev imap-dev php7-imap bzip2-dev gettext-dev libxml2-dev php7-dev php7-gd icu-dev \
77
php7-zip php7-tidy php7-intl libffi-dev openssl-dev php7-pear rabbitmq-c rabbitmq-c-dev librrd \
88
libzip-dev rrdtool-dev gmp-dev yaml yaml-dev fann fann-dev openldap-dev librdkafka librdkafka-dev libcurl curl-dev \
99
libpng-dev gpgme gpgme-dev libpq-dev aspell-dev libjpeg-turbo-dev libpng-dev libwebp-dev freetype-dev

tests/DockerImages/7.4/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM php:7.4-alpine
33
RUN set -eux; \
44
apk add --no-cache --virtual .build-deps \
55
bash gcc g++ make autoconf pkgconfig git \
6-
libmcrypt-dev imap-dev enchant2 php8-enchant bzip2-dev gettext-dev libxml2-dev icu-dev \
6+
libmcrypt-dev imap-dev bzip2-dev gettext-dev libxml2-dev icu-dev \
77
libffi-dev openssl-dev rabbitmq-c rabbitmq-c-dev librrd \
88
libzip-dev rrdtool-dev gmp-dev yaml yaml-dev fann fann-dev openldap-dev librdkafka librdkafka-dev libcurl curl-dev \
99
libpng-dev gpgme gpgme-dev libpq-dev aspell-dev libjpeg-turbo-dev libpng-dev libwebp-dev freetype-dev

tests/DockerImages/8.0/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM php:8.0-alpine
33
RUN set -eux; \
44
apk add --no-cache --virtual .build-deps \
55
bash gcc g++ make autoconf pkgconfig git \
6-
libmcrypt-dev imap-dev php8-imap enchant2 php8-enchant bzip2-dev gettext-dev libxml2-dev php8-dev php8-gd icu-dev \
6+
libmcrypt-dev imap-dev php8-imap bzip2-dev gettext-dev libxml2-dev php8-dev php8-gd icu-dev \
77
php8-zip php8-tidy php8-intl libffi-dev openssl-dev php8-pear rabbitmq-c rabbitmq-c-dev librrd \
88
libzip-dev rrdtool-dev gmp-dev yaml yaml-dev fann fann-dev openldap-dev librdkafka librdkafka-dev libcurl curl-dev \
99
libpng-dev gpgme gpgme-dev libpq-dev aspell-dev libjpeg-turbo-dev libpng-dev libwebp-dev freetype-dev libxslt-dev \

tests/DockerImages/8.3/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN set -eux; \
1111
mv temp.m4 /usr/src/php/ext/odbc/config.m4; \
1212
apk add --repository http://dl-cdn.alpinelinux.org/alpine/edge/community --no-cache --virtual .build-deps \
1313
bash gcc g++ make autoconf pkgconfig git \
14-
libmcrypt-dev imap-dev php-imap enchant2 php-enchant bzip2-dev gettext-dev libxml2-dev php83-dev php-gd icu-dev \
14+
libmcrypt-dev imap-dev php-imap bzip2-dev gettext-dev libxml2-dev php83-dev php-gd icu-dev \
1515
php-zip php-tidy php-intl libffi-dev openssl-dev php83-pear rabbitmq-c rabbitmq-c-dev librrd \
1616
libzip-dev rrdtool-dev gmp-dev yaml yaml-dev fann fann-dev openldap-dev librdkafka librdkafka-dev libcurl curl-dev \
1717
libpng-dev gpgme gpgme-dev libpq-dev aspell-dev libjpeg-turbo-dev libpng-dev libwebp-dev freetype-dev libxslt-dev \

tests/DockerImages/8.4/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM php:8.4-alpine
33
RUN set -eux; \
44
apk add --repository http://dl-cdn.alpinelinux.org/alpine/edge/community --no-cache --virtual .build-deps \
55
bash gcc g++ make autoconf pkgconfig git \
6-
libmcrypt-dev imap-dev php-imap enchant2 php-enchant bzip2-dev gettext-dev libxml2-dev php83-dev php-gd icu-dev \
6+
libmcrypt-dev imap-dev php-imap bzip2-dev gettext-dev libxml2-dev php83-dev php-gd icu-dev \
77
php-zip php-tidy php-intl libffi-dev openssl-dev php83-pear rabbitmq-c rabbitmq-c-dev librrd \
88
libzip-dev rrdtool-dev gmp-dev yaml yaml-dev fann fann-dev openldap-dev librdkafka librdkafka-dev libcurl curl-dev \
99
libpng-dev gpgme gpgme-dev libpq-dev aspell-dev libjpeg-turbo-dev libpng-dev libwebp-dev freetype-dev
@@ -14,4 +14,4 @@ RUN docker-php-ext-install gmp sockets intl gd ldap bz2 mysqli bcmath calendar d
1414
pdo_mysql shmop sysvmsg sysvsem sysvshm xml soap pgsql ftp
1515
#imap pspell
1616

17-
WORKDIR /opt/project/phpstorm-stubs
17+
WORKDIR /opt/project/phpstorm-stubs

tests/DockerImages/peclExtensions/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ RUN docker-php-ext-enable zip
4040
#RUN docker-php-ext-enable mongodb
4141
RUN pecl install rdkafka
4242
RUN docker-php-ext-enable rdkafka
43-
RUN pecl install yaf
44-
RUN docker-php-ext-enable yaf
43+
#RUN pecl install yaf
44+
#RUN docker-php-ext-enable yaf
4545
RUN pecl install yar
4646
RUN docker-php-ext-enable yar
4747
RUN pecl install gnupg

tests/DockerImages/testRunner/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY --from=composer /usr/bin/composer /usr/bin/composer
66
RUN set -eux; \
77
apk add --repository http://dl-cdn.alpinelinux.org/alpine/edge/community --no-cache --virtual .build-deps \
88
bash gcc g++ make autoconf pkgconfig git \
9-
libmcrypt-dev imap-dev php-imap enchant2 php-enchant bzip2-dev gettext-dev libxml2-dev php83-dev php-gd icu-dev \
9+
libmcrypt-dev imap-dev php-imap bzip2-dev gettext-dev libxml2-dev php83-dev php-gd icu-dev \
1010
php-zip php-tidy php-intl libffi-dev openssl-dev php83-pear rabbitmq-c rabbitmq-c-dev librrd \
1111
libzip-dev rrdtool-dev gmp-dev yaml yaml-dev fann fann-dev openldap-dev librdkafka librdkafka-dev libcurl curl-dev \
1212
libpng-dev gpgme gpgme-dev libpq-dev aspell-dev libjpeg-turbo-dev libpng-dev libwebp-dev freetype-dev

0 commit comments

Comments
 (0)