From e52808ec488874a526b144a62265bb4e004e29f4 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Tue, 24 Nov 2020 00:29:40 +0100
Subject: add acpu and imagick (without config)

---
 php-7.4-opt/TODO.md          |  5 ++---
 php-7.4-opt/build.Dockerfile | 20 +++++++++++++++++++-
 php-7.4-opt/copy.Dockerfile  |  2 ++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/php-7.4-opt/TODO.md b/php-7.4-opt/TODO.md
index e5069cd..b62f482 100644
--- a/php-7.4-opt/TODO.md
+++ b/php-7.4-opt/TODO.md
@@ -1,12 +1,11 @@
 ## ToDo
 
 - add imap to configure flags
-- add modules
-  - imagick
-  - apcu
 - add config files
   - php.ini
   - modules
+    - imagick
+    - apcu
   - checkinstall --include ?
 - correct depencies in .deb files
   - checkinstall --provides
diff --git a/php-7.4-opt/build.Dockerfile b/php-7.4-opt/build.Dockerfile
index c5af73b..5ebcf80 100644
--- a/php-7.4-opt/build.Dockerfile
+++ b/php-7.4-opt/build.Dockerfile
@@ -29,7 +29,9 @@ RUN apt-get update \
       bison \
       libgmp-dev \
       libtidy-dev \
-      libgd2-xpm-dev
+      libgd2-xpm-dev \
+      libmagickwand-dev \
+      libmagickcore-dev
 RUN wget https://cmake.org/files/v2.8/cmake-2.8.12.1.tar.gz
 RUN tar xzf cmake-2.8.12.1.tar.gz
 RUN cd cmake-2.8.12.1 \
@@ -131,4 +133,20 @@ RUN cd php-7.4.12 \
       --with-zlib \
   && make \
   && checkinstall -y --pkgname $PACKAGE_NAME
+RUN cd /php-7.4.12/ext \
+  && wget https://github.com/Imagick/imagick/archive/3.4.4.tar.gz \
+  && tar xzf 3.4.4.tar.gz \
+  && cd imagick-3.4.4 \
+  && $MAIN_PREFIX/bin/phpize \
+  && ./configure --with-php-config=$MAIN_PREFIX/bin/php-config \
+  && make \
+  && checkinstall -y -pkgname $PACKAGE_NAME-imagick
+RUN cd /php-7.4.12/ext \
+  && wget https://github.com/krakjoe/apcu/archive/v5.1.19.tar.gz \
+  && tar xzf v5.1.19.tar.gz \
+  && cd apcu-5.1.19 \
+  && $MAIN_PREFIX/bin/phpize \
+  && ./configure --with-php-config=$MAIN_PREFIX/bin/php-config \
+  && make \
+  && checkinstall -y -pkgname $PACKAGE_NAME-apcu
 
diff --git a/php-7.4-opt/copy.Dockerfile b/php-7.4-opt/copy.Dockerfile
index 1931ce5..e240d0f 100644
--- a/php-7.4-opt/copy.Dockerfile
+++ b/php-7.4-opt/copy.Dockerfile
@@ -8,4 +8,6 @@ COPY --from=build-stage /oniguruma-6.9.6/php-7.4.12-opt-oniguruma_6.9.6-1_amd64.
 COPY --from=build-stage /libgd-2.1.1/php-7.4.12-opt-libgd_2.1.1-1_amd64.deb .
 COPY --from=build-stage /libjpeg-turbo-2.0.6/build/php-7.4.12-opt-libjpeg-turbo_1-1_amd64.deb .
 COPY --from=build-stage /krb5-1.17.2/src/php-7.4.12-opt-krb5_1-1_amd64.deb .
+COPY --from=build-stage /php-7.4.12/ext/imagick-3.4.4/php-7.4.12-opt-imagick_3.4.4-1_amd64.deb .
+COPY --from=build-stage /php-7.4.12/ext/apcu-5.1.19/php-7.4.12-opt-apcu_5.1.19-1_amd64.deb .
 
-- 
cgit v1.2.3