Skip to content

Commit 1189598

Browse files
committed
Images generated through ./bin/ece-docker image:generate:php
1 parent d6cb5a4 commit 1189598

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

images/php/8.3-cli/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,10 @@ RUN apt-get update \
7272
libyaml-dev \
7373
libzip-dev \
7474
zip \
75-
python3-yaml \
7675
&& rm -rf /var/lib/apt/lists/*
7776

7877
# Install Python packages
79-
78+
RUN pip3 install --upgrade setuptools && pip3 install pyyaml
8079

8180
# Install Grunt
8281
RUN npm install -g grunt-cli
@@ -125,6 +124,7 @@ RUN pecl install -o -f \
125124
raphf \
126125
redis \
127126
xdebug-3.2.0 \
127+
xdebug-3.2.0 \
128128
xmlrpc-1.0.0RC3 \
129129
yaml
130130

images/php/8.3-fpm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ RUN apt-get update \
5353
libyaml-dev \
5454
libzip-dev \
5555
zip \
56-
python3-yaml \
5756
&& rm -rf /var/lib/apt/lists/*
5857

5958
# Install MailHog
@@ -100,6 +99,7 @@ RUN pecl install -o -f \
10099
raphf \
101100
redis \
102101
xdebug-3.2.0 \
102+
xdebug-3.2.0 \
103103
xmlrpc-1.0.0RC3 \
104104
yaml
105105

src/Command/Image/GeneratePhp.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,16 @@
2626
class GeneratePhp extends Command
2727
{
2828
private const NAME = 'image:generate:php';
29-
private const SUPPORTED_VERSIONS = ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2'];
29+
private const SUPPORTED_VERSIONS = ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3'];
3030

3131
private const VERSION_MAP = [
3232
'7.2' => '7.2',
3333
'7.3' => '7.3',
3434
'7.4' => '7.4',
3535
'8.0' => '8.0.14',
3636
'8.1' => '8.1.1',
37-
'8.2' => '8.2'
37+
'8.2' => '8.2',
38+
'8.3' => '8.3'
3839
];
3940

4041
private const EDITION_CLI = 'cli';

src/Compose/Php/ExtensionResolver.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,11 @@ public static function getConfig(): array
431431
self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL,
432432
self::EXTENSION_PACKAGE_NAME => 'xdebug-3.2.0',
433433
],
434+
'>=8.3' => [
435+
self::EXTENSION_TYPE => self::EXTENSION_TYPE_PECL,
436+
self::EXTENSION_PACKAGE_NAME => 'xdebug-3.2.0',
437+
],
438+
434439
],
435440
'xmlrpc' => [
436441
'>=7.0 <8.0' => [self::EXTENSION_TYPE => self::EXTENSION_TYPE_CORE],

0 commit comments

Comments
 (0)