Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions ci/image-tests/Checks/PhpChecks.php
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,14 @@ public function testComposer(): void
$this->assertCommandSucceeds('/usr/local/bin/composer');
}

/**
* phpversion('imagick') is a version number, not the placeholder of the source, which libraries compare.
*/
public function testImagickReportsItsVersion(): void
{
self::assertMatchesRegularExpression('/^\d+\.\d+\.\d+$/', $this->stdout('php -r \'echo phpversion("imagick");\''));
}

public function testGraphicsMagick(): void
{
self::assertTrue($this->file('/usr/bin/gm')->isExecutable, '/usr/bin/gm should be executable');
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.2-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@
&& PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
&& docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it

Check warning on line 154 in docker/php-official/8.2-alpine/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2uVJLluC_pRtDG&open=AaHmpM2uVJLluC_pRtDG&pullRequest=626
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \

Check warning on line 155 in docker/php-official/8.2-alpine/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2uVJLluC_pRtDH&open=AaHmpM2uVJLluC_pRtDH&pullRequest=626
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& docker-php-ext-configure ldap \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it

Check warning on line 156 in docker/php-official/8.2/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM07VJLluC_pRtC-&open=AaHmpM07VJLluC_pRtC-&pullRequest=626
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \

Check warning on line 157 in docker/php-official/8.2/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM07VJLluC_pRtC_&open=AaHmpM07VJLluC_pRtC_&pullRequest=626
&& docker-php-ext-configure ldap \
&& docker-php-ext-configure ftp --with-openssl-dir \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.3-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@
&& PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
&& docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it

Check warning on line 154 in docker/php-official/8.3-alpine/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM24VJLluC_pRtDK&open=AaHmpM24VJLluC_pRtDK&pullRequest=626
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \

Check warning on line 155 in docker/php-official/8.3-alpine/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM24VJLluC_pRtDL&open=AaHmpM24VJLluC_pRtDL&pullRequest=626
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& docker-php-ext-configure ldap \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it

Check warning on line 156 in docker/php-official/8.3/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2kVJLluC_pRtDC&open=AaHmpM2kVJLluC_pRtDC&pullRequest=626
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \

Check warning on line 157 in docker/php-official/8.3/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2kVJLluC_pRtDD&open=AaHmpM2kVJLluC_pRtDD&pullRequest=626
&& docker-php-ext-configure ldap \
&& docker-php-ext-configure ftp --with-openssl-dir \
&& PHP_OPENSSL=yes docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.4-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@
&& PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
&& docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it

Check warning on line 154 in docker/php-official/8.4-alpine/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2eVJLluC_pRtDA&open=AaHmpM2eVJLluC_pRtDA&pullRequest=626
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \

Check warning on line 155 in docker/php-official/8.4-alpine/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2eVJLluC_pRtDB&open=AaHmpM2eVJLluC_pRtDB&pullRequest=626
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& docker-php-ext-configure ldap \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it

Check warning on line 155 in docker/php-official/8.4/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM29VJLluC_pRtDM&open=AaHmpM29VJLluC_pRtDM&pullRequest=626
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \

Check warning on line 156 in docker/php-official/8.4/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM29VJLluC_pRtDN&open=AaHmpM29VJLluC_pRtDN&pullRequest=626
&& docker-php-ext-configure ldap \
&& docker-php-ext-configure ftp --with-ftp-ssl \
&& docker-php-ext-install -j"$(nproc)" \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.5-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@
&& PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
&& docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it

Check warning on line 154 in docker/php-official/8.5-alpine/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2pVJLluC_pRtDE&open=AaHmpM2pVJLluC_pRtDE&pullRequest=626
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \

Check warning on line 155 in docker/php-official/8.5-alpine/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2pVJLluC_pRtDF&open=AaHmpM2pVJLluC_pRtDF&pullRequest=626
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& docker-php-ext-configure ldap \
Expand Down
2 changes: 2 additions & 0 deletions docker/php-official/8.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it

Check warning on line 155 in docker/php-official/8.5/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2zVJLluC_pRtDI&open=AaHmpM2zVJLluC_pRtDI&pullRequest=626
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \

Check warning on line 156 in docker/php-official/8.5/Dockerfile

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Line is too long. Split it into multiple lines using backslash continuations.

See more on https://sonarcloud.io/project/issues?id=webdevops_Dockerfile&issues=AaHmpM2zVJLluC_pRtDJ&open=AaHmpM2zVJLluC_pRtDJ&pullRequest=626
&& docker-php-ext-configure ldap \
&& docker-php-ext-configure ftp --with-ftp-ssl \
&& docker-php-ext-install -j"$(nproc)" \
Expand Down
4 changes: 4 additions & 0 deletions template/Dockerfile/images/php.twig
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \
&& docker-php-ext-configure ldap \
{% if version == '8.2' or version == '8.3' %}
&& docker-php-ext-configure ftp --with-openssl-dir \
Expand Down Expand Up @@ -227,6 +229,8 @@
&& PKG_CONFIG_PATH=/usr/local docker-php-ext-configure intl \
&& docker-php-ext-configure gd --with-avif --with-jpeg --with-freetype --with-webp \
&& git clone --branch master --depth 1 https://github.com/Imagick/imagick.git /usr/src/php/ext/imagick \
# imagick leaves its version to the packaging of PECL; take it from package.xml, so that phpversion('imagick') reports it
&& sed -i "s/@PACKAGE_VERSION@/$(sed -n 's:.*<release>\([0-9][0-9.]*\)</release>.*:\1:p' /usr/src/php/ext/imagick/package.xml | head -n 1)/" /usr/src/php/ext/imagick/php_imagick.h \
&& git clone --branch latest --depth 1 https://github.com/php-amqp/php-amqp.git /usr/src/php/ext/amqp \
&& cd /usr/src/php/ext/amqp && git submodule update --init \
&& docker-php-ext-configure ldap \
Expand Down
Loading