Skip to content

Commit

Permalink
Merge pull request #83 from burningmantech/yf-imagick-fix
Browse files Browse the repository at this point in the history
The imagick extension is currently not up to date. Work around this. Sigh.
  • Loading branch information
mikeburg authored Dec 24, 2024
2 parents 0e2232a + 1f31fb1 commit ecfdcb8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
auth.docker.io:443
dl-cdn.alpinelinux.org:443
github.com:443
objects.githubusercontent.com:443
pecl.php.net:443
production.cloudflare.docker.com:443
productionresultssa4.blob.core.windows.net:443
Expand Down Expand Up @@ -74,6 +75,7 @@ jobs:
allowed-endpoints: >
api.github.com:443
github.com:443
objects.githubusercontent.com:443
- name: Checkout source code
uses: actions/checkout@v4
Expand Down Expand Up @@ -109,6 +111,7 @@ jobs:
api.github.com:443
ghcr.io:443
github.com:443
objects.githubusercontent.com:443
# Need source code to push README file contents to Docker Hub
- name: Checkout source code
Expand Down
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ RUN apk add --no-cache \
libwebp-dev \
libxml2-dev \
libzip-dev \
pcre-dev ${PHPIZE_DEPS} \
&& cd /tmp && git clone https://github.com/Imagick/imagick.git \
&& MAKEFLAGS="-j $(nproc)" pecl install /tmp/imagick/package.xml \
pcre-dev ${PHPIZE_DEPS} ;
ADD --chmod=0755 \
https://github.com/mlocati/docker-php-extension-installer/releases/download/2.6.3/install-php-extensions \
/usr/local/bin/
# TODO: Use latest released version, after https://github.com/Imagick/imagick/issues/640 is fixed
RUN install-php-extensions imagick/imagick@28f27044e435a2b203e32675e942eb8de620ee58 \
&& docker-php-ext-configure opcache --enable-opcache \
&& docker-php-ext-configure intl \
&& docker-php-ext-configure exif \
Expand Down

0 comments on commit ecfdcb8

Please sign in to comment.