Skip to content

Commit 25e0e12

Browse files
cytopiacytopia
authored
Merge pull request #204 from devilbox/release-0.124
Release 0.124
2 parents 282c019 + 15ff7ff commit 25e0e12

33 files changed

Lines changed: 453 additions & 262 deletions

‎.github/workflows/nightly.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- '8.1'
4141
refs:
4242
- 'master'
43-
- '0.123'
43+
- '0.124'
4444
steps:
4545

4646
# ------------------------------------------------------------

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@
44
## Unreleased
55

66

7+
## Release 0.124
8+
9+
#### Fixed
10+
- Fixed `pdo_sqlsrv` version for PHP 7.2
11+
- Fixed `sqlsrv` version for PHP 7.2
12+
- Fixed `swoole` version for PHP 7.1
13+
- Fixed pip installation
14+
15+
#### Changed
16+
- Removed `opcache` for PHP 8.1
17+
- Removed `xlswriter` for PHP 8.1
18+
- Removed `linuxbrew` for all versions
19+
- [#201](https://github.com/devilbox/docker-php-fpm/issues/201) Deactivated `psr` and `phalcon` by default
20+
- Removed `drush9` from PHP 7.0 and 7.1
21+
- Removed `drupalconsole` from PHP 7.0 and 7.1
22+
23+
724
## Release 0.123
825

926
#### Fixed

‎Dockerfiles/mods/Dockerfile-5.2‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,13 @@ RUN set -eux \
767767
&& true
768768

769769

770+
# Deactive PSR and Phalcon:
771+
# https://github.com/devilbox/docker-php-fpm/issues/201
772+
RUN set -eux \
773+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
774+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
775+
776+
770777
###
771778
### Ports
772779
###

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -910,6 +910,13 @@ RUN set -eux \
910910
&& true
911911

912912

913+
# Deactive PSR and Phalcon:
914+
# https://github.com/devilbox/docker-php-fpm/issues/201
915+
RUN set -eux \
916+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
917+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
918+
919+
913920
###
914921
### Ports
915922
###

‎Dockerfiles/mods/Dockerfile-5.4‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,13 @@ RUN set -eux \
931931
&& true
932932

933933

934+
# Deactive PSR and Phalcon:
935+
# https://github.com/devilbox/docker-php-fpm/issues/201
936+
RUN set -eux \
937+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
938+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
939+
940+
934941
###
935942
### Ports
936943
###

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,13 @@ RUN set -eux \
960960
&& true
961961

962962

963+
# Deactive PSR and Phalcon:
964+
# https://github.com/devilbox/docker-php-fpm/issues/201
965+
RUN set -eux \
966+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
967+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
968+
969+
963970
###
964971
### Ports
965972
###

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -977,6 +977,13 @@ RUN set -eux \
977977
&& true
978978

979979

980+
# Deactive PSR and Phalcon:
981+
# https://github.com/devilbox/docker-php-fpm/issues/201
982+
RUN set -eux \
983+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
984+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
985+
986+
980987
###
981988
### Ports
982989
###

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,6 +1110,13 @@ RUN set -eux \
11101110
&& true
11111111

11121112

1113+
# Deactive PSR and Phalcon:
1114+
# https://github.com/devilbox/docker-php-fpm/issues/201
1115+
RUN set -eux \
1116+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
1117+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1118+
1119+
11131120
###
11141121
### Ports
11151122
###

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -643,10 +643,10 @@ RUN set -eux \
643643

644644
# -------------------- Installing PHP Extension: swoole --------------------
645645
RUN set -eux \
646-
# Installation: Generic
646+
# Installation: Version specific
647647
# Type: PECL extension
648-
# Custom: Pecl command
649-
&& yes yes | pecl install swoole \
648+
# Default: Pecl command
649+
&& pecl install swoole-4.4.26 \
650650
# Enabling
651651
&& docker-php-ext-enable swoole \
652652
&& true
@@ -1124,6 +1124,13 @@ RUN set -eux \
11241124
&& true
11251125

11261126

1127+
# Deactive PSR and Phalcon:
1128+
# https://github.com/devilbox/docker-php-fpm/issues/201
1129+
RUN set -eux \
1130+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
1131+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1132+
1133+
11271134
###
11281135
### Ports
11291136
###

‎Dockerfiles/mods/Dockerfile-7.2‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -479,10 +479,10 @@ RUN set -eux \
479479

480480
# -------------------- Installing PHP Extension: pdo_sqlsrv --------------------
481481
RUN set -eux \
482-
# Installation: Generic
482+
# Installation: Version specific
483483
# Type: PECL extension
484484
# Default: Pecl command
485-
&& pecl install pdo_sqlsrv \
485+
&& pecl install pdo_sqlsrv-5.8.1 \
486486
# Enabling
487487
&& docker-php-ext-enable pdo_sqlsrv \
488488
&& true
@@ -624,10 +624,10 @@ RUN set -eux \
624624

625625
# -------------------- Installing PHP Extension: sqlsrv --------------------
626626
RUN set -eux \
627-
# Installation: Generic
627+
# Installation: Version specific
628628
# Type: PECL extension
629629
# Default: Pecl command
630-
&& pecl install sqlsrv \
630+
&& pecl install sqlsrv-5.8.1 \
631631
# Enabling
632632
&& docker-php-ext-enable sqlsrv \
633633
&& true
@@ -1129,6 +1129,13 @@ RUN set -eux \
11291129
&& true
11301130

11311131

1132+
# Deactive PSR and Phalcon:
1133+
# https://github.com/devilbox/docker-php-fpm/issues/201
1134+
RUN set -eux \
1135+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-phalcon.ini || true \
1136+
&& rm -f /usr/local/etc/php/conf.d/docker-php-ext-psr.ini || true \
1137+
1138+
11321139
###
11331140
### Ports
11341141
###

0 commit comments

Comments
 (0)