Update to v3.0.1 and php 8.0 (monicahq#57)

manugratx · May 4, 2021 · 8e338da · 8e338da
1 parent 9db94d2
commit 8e338da
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 40 deletions.
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -22,7 +22,6 @@ RUN set -ex; \
         jpeg-dev \
         gmp-dev \
         libmemcached-dev \
-        imagemagick-dev \
         libwebp-dev \
     ; \
     \
@@ -43,13 +42,11 @@ 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="$( \

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -26,7 +26,6 @@ RUN set -ex; \
         libjpeg62-turbo-dev \
         libgmp-dev \
         libmemcached-dev \
-        libmagickwand-dev \
         libwebp-dev \
     ; \
     \
@@ -50,13 +49,11 @@ 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

diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM php:8.0-apache
 
 # opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
@@ -34,7 +34,6 @@ RUN set -ex; \
         libjpeg62-turbo-dev \
         libgmp-dev \
         libmemcached-dev \
-        libmagickwand-dev \
         libwebp-dev \
     ; \
     \
@@ -58,13 +57,11 @@ RUN set -ex; \
     pecl install APCu-5.1.20; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.4; \
-    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
@@ -131,9 +128,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v3.0.0
-LABEL org.opencontainers.image.revision="02ba3694929154ecdafbe95fa34ad6920680b6b7" \
-      org.opencontainers.image.version="v3.0.0"
+ENV MONICA_VERSION v3.0.1
+LABEL org.opencontainers.image.revision="fbac24891a9ace9f9c88fd4d23b8612243af283a" \
+      org.opencontainers.image.version="v3.0.1"
 
 RUN set -ex; \
     fetchDeps=" \

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm-alpine
+FROM php:8.0-fpm-alpine
 
 # opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
@@ -30,7 +30,6 @@ RUN set -ex; \
         jpeg-dev \
         gmp-dev \
         libmemcached-dev \
-        imagemagick-dev \
         libwebp-dev \
     ; \
     \
@@ -51,13 +50,11 @@ RUN set -ex; \
     pecl install APCu-5.1.20; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.4; \
-    pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
         apcu \
         memcached \
         redis \
-        imagick \
     ; \
     \
     runDeps="$( \
@@ -105,9 +102,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v3.0.0
-LABEL org.opencontainers.image.revision="02ba3694929154ecdafbe95fa34ad6920680b6b7" \
-      org.opencontainers.image.version="v3.0.0"
+ENV MONICA_VERSION v3.0.1
+LABEL org.opencontainers.image.revision="fbac24891a9ace9f9c88fd4d23b8612243af283a" \
+      org.opencontainers.image.version="v3.0.1"
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4-fpm
+FROM php:8.0-fpm
 
 # opencontainers annotations https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
@@ -34,7 +34,6 @@ RUN set -ex; \
         libjpeg62-turbo-dev \
         libgmp-dev \
         libmemcached-dev \
-        libmagickwand-dev \
         libwebp-dev \
     ; \
     \
@@ -58,13 +57,11 @@ RUN set -ex; \
     pecl install APCu-5.1.20; \
     pecl install memcached-3.1.5; \
     pecl install redis-5.3.4; \
-    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
@@ -117,9 +114,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v3.0.0
-LABEL org.opencontainers.image.revision="02ba3694929154ecdafbe95fa34ad6920680b6b7" \
-      org.opencontainers.image.version="v3.0.0"
+ENV MONICA_VERSION v3.0.1
+LABEL org.opencontainers.image.revision="fbac24891a9ace9f9c88fd4d23b8612243af283a" \
+      org.opencontainers.image.version="v3.0.1"
 
 RUN set -ex; \
     fetchDeps=" \

diff --git a/update.sh b/update.sh
@@ -9,7 +9,7 @@ _template() {
 }
 
 declare -A php_version=(
-    [default]='7.4'
+    [default]='8.0'
 )
 
 declare -A cmd=(
@@ -64,21 +64,10 @@ 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() {
@@ -122,7 +111,6 @@ 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"