Skip to content

Fix imap libc-client2007e regression from PR #576 #580

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

Merged
Kanti merged 1 commit into from
Oct 2, 2026
Merged

Fix imap libc-client2007e regression from PR #576 #580

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker/php-official/8.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apt-get purge -y -f --force-yes \
libc-client-dev \
libc-client2007e-dev \
libkrb5-dev \
libbz2-dev \
libavif-dev \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ RUN set -x \
libpng16-16 \
libmcrypt4 \
libzip4 \
libc-client2007e \
# Dev and headers
libavif-dev \
libjpeg62-turbo-dev \
Expand Down Expand Up @@ -199,6 +200,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apt-get purge -y -f --force-yes \
libc-client-dev \
libc-client2007e-dev \
libkrb5-dev \
libbz2-dev \
libavif-dev \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ RUN set -x \
libpng16-16 \
libmcrypt4 \
libzip4 \
libc-client2007e \
# Dev and headers
libavif-dev \
libjpeg62-turbo-dev \
Expand Down Expand Up @@ -199,6 +200,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apt-get purge -y -f --force-yes \
libc-client-dev \
libc-client2007e-dev \
libkrb5-dev \
libbz2-dev \
libavif-dev \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/8.4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apt-get purge -y -f --force-yes \
libc-client-dev \
libc-client2007e-dev \
libkrb5-dev \
libbz2-dev \
libavif-dev \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/8.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ RUN set -x \
# Uninstall dev and header packages
&& apt-get purge -y -f --force-yes \
libc-client-dev \
libc-client2007e-dev \
libkrb5-dev \
libbz2-dev \
libavif-dev \
Expand Down
4 changes: 4 additions & 0 deletions template/Dockerfile/images/php.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
libpng16-16 \
libmcrypt4 \
libzip4 \
{%- if version == '8.2' or version == '8.3' %}
libc-client2007e \
{%- endif %}
# Dev and headers
libavif-dev \
libjpeg62-turbo-dev \
Expand Down Expand Up @@ -142,6 +145,7 @@
# Uninstall dev and header packages
&& apt-get purge -y -f --force-yes \
libc-client-dev \
libc-client2007e-dev \
libkrb5-dev \
libbz2-dev \
libavif-dev \
Expand Down
1 change: 1 addition & 0 deletions tests/serverspec/spec/docker/php-apache-dev_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
include_examples 'collection::base'
include_examples 'collection::base-app'
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
include_examples 'php::cli::test::imap' if $testConfiguration[:phpImap]

if ($testConfiguration[:php] == 5)
include_examples 'collection::php5::development'
Expand Down
1 change: 1 addition & 0 deletions tests/serverspec/spec/docker/php-apache_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
include_examples 'collection::base'
include_examples 'collection::base-app'
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
include_examples 'php::cli::test::imap' if $testConfiguration[:phpImap]

if ($testConfiguration[:php] == 5)
include_examples 'collection::php5::production'
Expand Down
1 change: 1 addition & 0 deletions tests/serverspec/spec/docker/php-dev_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
include_examples 'collection::base'
include_examples 'collection::base-app'
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
include_examples 'php::cli::test::imap' if $testConfiguration[:phpImap]

if ($testConfiguration[:php] == 5)
include_examples 'collection::php5::development'
Expand Down
1 change: 1 addition & 0 deletions tests/serverspec/spec/docker/php-nginx-dev_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
include_examples 'collection::base'
include_examples 'collection::base-app'
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
include_examples 'php::cli::test::imap' if $testConfiguration[:phpImap]

if ($testConfiguration[:php] == 5)
include_examples 'collection::php5::development'
Expand Down
1 change: 1 addition & 0 deletions tests/serverspec/spec/docker/php-nginx_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
include_examples 'collection::base'
include_examples 'collection::base-app'
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
include_examples 'php::cli::test::imap' if $testConfiguration[:phpImap]

if ($testConfiguration[:php] == 5)
include_examples 'collection::php5::production'
Expand Down
1 change: 1 addition & 0 deletions tests/serverspec/spec/docker/php-official_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
include_examples 'collection::base'
include_examples 'collection::base-app'
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
include_examples 'php::cli::test::imap' if $testConfiguration[:phpImap]

if ($testConfiguration[:php] == 5)
include_examples 'collection::php5::production'
Expand Down
1 change: 1 addition & 0 deletions tests/serverspec/spec/docker/php_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
include_examples 'collection::base'
include_examples 'collection::base-app'
include_examples 'php::modules::ftp_ssl' if $testConfiguration[:php] == 8
include_examples 'php::cli::test::imap' if $testConfiguration[:phpImap]

if ($testConfiguration[:php] == 5)
include_examples 'collection::php5::production'
Expand Down
15 changes: 15 additions & 0 deletions tests/serverspec/spec/shared/php/test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,21 @@
end
end

shared_examples 'php::cli::test::imap' do
describe command('php -m') do
its(:stdout) { should contain('imap') }
its(:stderr) { should_not contain('Unable to load dynamic library') }
its(:stderr) { should_not contain('libc-client.so.2007e') }
its(:exit_status) { should eq 0 }
end

describe command('php -r \'exit(extension_loaded("imap") ? 0 : 1);\'') do
its(:stderr) { should_not contain('Unable to load dynamic library') }
its(:stderr) { should_not contain('libc-client.so.2007e') }
its(:exit_status) { should eq 0 }
end
end

shared_examples 'php::cli::test::php_ini_scanned_files' do
describe command('php -r "echo php_ini_scanned_files();"') do
its(:stdout) { should contain('-docker.ini') }
Expand Down
5 changes: 5 additions & 0 deletions tests/serverspec/spec/spec_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@
$testConfiguration[:php] = 8
end

$testConfiguration[:phpImap] = false
if (ENV['DOCKER_TAG'] =~ /^8\.[23](-|$)/)

Check failure on line 70 in tests/serverspec/spec/spec_config.rb

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Provide a default value or use ENV.fetch() to validate this environment variable access. 


See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaD3PvfliBdTFW1x1_Cy&open=AaD3PvfliBdTFW1x1_Cy&pullRequest=580
$testConfiguration[:phpImap] = true
end

if ENV['PHP_OFFICIAL'] and ENV['PHP_OFFICIAL'] == "1"
$testConfiguration[:phpOfficialImage] = true
end
Expand Down
Loading