Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: php8.3-xdebug and redis, memcached now available #5608

Merged
merged 1 commit into from
Dec 8, 2023
Merged

fix: php8.3-xdebug and redis, memcached now available #5608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions containers/ddev-php-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ ENV php81_amd64=$php80_amd64
ENV php81_arm64=$php81_amd64
ENV php82_amd64=$php81_amd64
ENV php82_arm64=$php82_amd64
# php8.3 is still missing memcached redis xdebug
ENV php83_amd64="apcu bcmath bz2 curl cli common fpm gd imagick intl ldap mbstring mysql opcache pgsql readline soap sqlite3 uploadprogress xhprof xml xmlrpc zip"
ENV php83_amd64=$php82_amd64
ENV php83_arm64=$php83_amd64

RUN for v in $PHP_VERSIONS; do \
Expand Down
2 changes: 1 addition & 1 deletion containers/ddev-webserver/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
### Build ddev-php-base from ddev-webserver-base
### ddev-php-base is the basic of ddev-php-prod
### and ddev-webserver-* (For DDEV local usage)
FROM ddev/ddev-php-base:v1.22.5 as ddev-webserver-base
FROM ddev/ddev-php-base:20231205_xdebug as ddev-webserver-base

ENV BACKDROP_DRUSH_VERSION=1.4.0
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
3 changes: 1 addition & 2 deletions pkg/ddevapp/ddevapp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,8 +925,7 @@ func TestDdevXdebugEnabled(t *testing.T) {

// Most of the time there's no reason to do all versions of PHP
phpKeys := []string{}
// TODO: Enable 8.3 when php8.3-xdebug becomes available
exclusions := []string{"5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.3"}
exclusions := []string{"5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0"}
for k := range nodeps.ValidPHPVersions {
if os.Getenv("GOTEST_SHORT") != "" && !nodeps.ArrayContainsString(exclusions, k) {
phpKeys = append(phpKeys, k)
Expand Down
2 changes: 1 addition & 1 deletion pkg/versionconstants/versionconstants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var AmplitudeAPIKey = ""
var WebImg = "ddev/ddev-webserver"

// WebTag defines the default web image tag
var WebTag = "v1.22.5" // Note that this can be overridden by make
var WebTag = "20231205_xdebug" // Note that this can be overridden by make

// DBImg defines the default db image used for applications.
var DBImg = "ddev/ddev-dbserver"
Expand Down