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.

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

[DEVX-2882] Add missing README line for 8.3 and fix imagick installation. #124

Merged
merged 2 commits into from
Sep 19, 2024
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
14 changes: 13 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,19 @@ RUN pecl config-set php_ini /usr/local/etc/php/php.ini && \
pear config-set php_ini /usr/local/etc/php/php.ini && \
pecl channel-update pecl.php.net

RUN pecl install imagick
ADD patches/641.diff /tmp/641.diff

RUN pecl download imagick && \
tar -xvf imagick-*.tgz && \
rm imagick-*.tgz && \
cd imagick-* && \
git apply < /tmp/641.diff && \
phpize && \
./configure && \
make && \
make install && \
cd .. && \
rm -rf imagick-*
RUN docker-php-ext-enable imagick

RUN pecl install pcov
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ docker build --build-arg PHPVERSION=$PHPVERSION -t quay.io/pantheon-public/build
- quay.io/pantheon-public/build-tools-ci:8.x-php8.0
- quay.io/pantheon-public/build-tools-ci:8.x-php8.1
- quay.io/pantheon-public/build-tools-ci:8.x-php8.2
- quay.io/pantheon-public/build-tools-ci:8.x-php8.3

#### Usage example

Expand Down
10 changes: 10 additions & 0 deletions patches/641.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff --git a/Imagick.stub.php b/Imagick.stub.php
index 804c0152..49da9386 100644
--- a/Imagick.stub.php
+++ b/Imagick.stub.php
@@ -1669,4 +1669,5 @@ public function setInterpolateMethod(int $method): bool{}
public function setOrientation(int $orientation): bool {}
#endif

+#endif
}
Loading