update to v2.19.0 (#26)

.github/workflows/build.yml

@@ -24,13 +24,23 @@ jobs:
       run: |
         sed -i -e 's/FROM php/FROM i386\/php/g' "${{ matrix.variant }}/Dockerfile"
 
-    - name: Build image ${{ matrix.variant }} ${{ matrix.arch }}
+    - name: Update base image
+      if: matrix.arch == 'i386'
+      run: |
+        docker pull i386/php:7.3-${{ matrix.variant }}
+
+    - name: Update base image
+      if: matrix.arch != 'i386'
       run: |
         docker pull php:7.3-${{ matrix.variant }}
+
+    - name: Build image ${{ matrix.variant }} ${{ matrix.arch }}
+      run: |
         docker build ${{ matrix.variant }} -t monica:${{ matrix.variant }}
         docker images
 
     - name: Test image ${{ matrix.variant }} ${{ matrix.arch }}
+      if: matrix.arch != 'i386' || matrix.variant != 'apache'
       run: |
         official-images/test/run.sh monica:${{ matrix.variant }}
 

Dockerfile-alpine.template

@@ -22,6 +22,7 @@ RUN set -ex; \
         jpeg-dev \
         gmp-dev \
         libmemcached-dev \
+        imagemagick-dev \
     ; \
     \
     docker-php-ext-configure intl; \
@@ -46,11 +47,13 @@ RUN set -ex; \
     pecl install APCu-%%APCU_VERSION%%; \
     pecl install memcached-%%MEMCACHED_VERSION%%; \
     pecl install redis-%%REDIS_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
     runDeps="$( \

Dockerfile-debian.template

@@ -26,6 +26,7 @@ RUN set -ex; \
         libjpeg62-turbo-dev \
         libgmp-dev \
         libmemcached-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -48,11 +49,13 @@ RUN set -ex; \
     pecl install APCu-%%APCU_VERSION%%; \
     pecl install memcached-%%MEMCACHED_VERSION%%; \
     pecl install redis-%%REDIS_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies

apache/Dockerfile

@@ -34,6 +34,7 @@ RUN set -ex; \
         libjpeg62-turbo-dev \
         libgmp-dev \
         libmemcached-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -56,11 +57,13 @@ RUN set -ex; \
     pecl install APCu-5.1.18; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.1; \
+    pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -127,9 +130,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v2.18.0
+ENV MONICA_VERSION v2.19.0
-LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
+LABEL org.opencontainers.image.revision="afded47750156f5ec4d41edbccbee0b63b6a21e8" \
-      org.opencontainers.image.version="v2.18.0"
+      org.opencontainers.image.version="v2.19.0"
 
 RUN set -ex; \
     fetchDeps=" \

fpm-alpine/Dockerfile

@@ -30,6 +30,7 @@ RUN set -ex; \
         jpeg-dev \
         gmp-dev \
         libmemcached-dev \
+        imagemagick-dev \
     ; \
     \
     docker-php-ext-configure intl; \
@@ -54,11 +55,13 @@ RUN set -ex; \
     pecl install APCu-5.1.18; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.1; \
+    pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
     runDeps="$( \
@@ -106,9 +109,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v2.18.0
+ENV MONICA_VERSION v2.19.0
-LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
+LABEL org.opencontainers.image.revision="afded47750156f5ec4d41edbccbee0b63b6a21e8" \
-      org.opencontainers.image.version="v2.18.0"
+      org.opencontainers.image.version="v2.19.0"
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \

fpm/Dockerfile

@@ -34,6 +34,7 @@ RUN set -ex; \
         libjpeg62-turbo-dev \
         libgmp-dev \
         libmemcached-dev \
+        libmagickwand-dev \
     ; \
     \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -56,11 +57,13 @@ RUN set -ex; \
     pecl install APCu-5.1.18; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.1; \
+    pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
+        imagick \
     ; \
     \
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -113,9 +116,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v2.18.0
+ENV MONICA_VERSION v2.19.0
-LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
+LABEL org.opencontainers.image.revision="afded47750156f5ec4d41edbccbee0b63b6a21e8" \
-      org.opencontainers.image.version="v2.18.0"
+      org.opencontainers.image.version="v2.19.0"
 
 RUN set -ex; \
     fetchDeps=" \

update.sh

@@ -64,10 +64,21 @@ redis_version="$(
 )"
 echo "  Redis version: $redis_version"
 
+imagick_version="$(
+	git ls-remote --tags https://github.com/mkoppanen/imagick.git \
+		| cut -d/ -f3 \
+		| grep -viE '[a-z]' \
+		| tr -d '^{}' \
+		| sort -V \
+		| tail -1
+)"
+echo "  Imagick version: $imagick_version"
+
 declare -A pecl_versions=(
     [APCu]="$apcu_version"
     [memcached]="$memcached_version"
     [redis]="$redis_version"
+    [imagick]="$imagick_version"
 )
 
 _githubapi() {
@@ -111,6 +122,7 @@ for variant in apache fpm fpm-alpine; do
         s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/;
         s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/;
         s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/;
+        s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/;
     ' \
         -e "s/%0A/\n/g;" \
         $template > "$variant/Dockerfile"