Skip to content

Commit 6d26456

Browse files
committed
Merge branch 'v4' of github.com:thecodingmachine/docker-images-php into v4-dev
# Conflicts: # .github/workflows/workflow.yml # .travis.yml
2 parents 5c8ef1c + 0985339 commit 6d26456

File tree

5 files changed

+3
-69
lines changed

5 files changed

+3
-69
lines changed

.github/workflows/workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ jobs:
7272
# docker push thecodingmachine/php:${{ matrix.php_version }}-v3-${BRANCH_VARIANT}
7373
# docker push thecodingmachine/php:${{ matrix.php_version }}-v3-${BRANCH_VARIANT}-node8
7474
# docker push thecodingmachine/php:${{ matrix.php_version }}-v3-${BRANCH_VARIANT}-node10
75-
# docker push thecodingmachine/php:${{ matrix.php_version }}-v3-${BRANCH_VARIANT}-node12
75+
# docker push thecodingmachine/php:${{ matrix.php_version }}-v3-${BRANCH_VARIANT}-node12

.travis.yml

Lines changed: 0 additions & 65 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Below is a list of extensions available in this image:
153153
- *mcrypt* is not available anymore in PHP 7.3+
154154
- *weakref* is not compatible with PHP 7.3+ (but weak references were added to the PHP core in PHP 7.4)
155155
- *sybase* extension is not available in v4 (use v3)
156-
- *ev*, *gnupg*, *mongodb*, *rdkafka*, *swoole*, *uploadprogress*, *xmlrpc*, *blackfire* are not available in PHP 8.0+
156+
- *ev*, *event*, *gnupg*, *mongodb*, *rdkafka*, *swoole*, *uploadprogress*, *xmlrpc*, *blackfire* are not available in PHP 8.0+
157157

158158
### Enabling/disabling extensions in the fat image
159159

extensions/8.0/event

Lines changed: 0 additions & 1 deletion
This file was deleted.

utils/README.blueprint.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Below is a list of extensions available in this image:
108108
- *mcrypt* is not available anymore in PHP 7.3+
109109
- *weakref* is not compatible with PHP 7.3+ (but weak references were added to the PHP core in PHP 7.4)
110110
- *sybase* extension is not available in v4 (use v3)
111-
- *ev*, *gnupg*, *mongodb*, *rdkafka*, *swoole*, *uploadprogress*, *xmlrpc*, *blackfire* are not available in PHP 8.0+
111+
- *ev*, *event*, *gnupg*, *mongodb*, *rdkafka*, *swoole*, *uploadprogress*, *xmlrpc*, *blackfire* are not available in PHP 8.0+
112112

113113
### Enabling/disabling extensions in the fat image
114114

0 commit comments

Comments
 (0)