Update to v2.21.0 (monicahq#50)

manugratx · Apr 26, 2021 · b3f2126 · b3f2126
1 parent 0930aec
commit b3f2126
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,12 +27,12 @@ jobs:
     - name: Update base image
       if: matrix.arch == 'i386'
       run: |
-        docker pull i386/php:7.3-${{ matrix.variant }}
+        docker pull i386/php:7.4-${{ matrix.variant }}
 
     - name: Update base image
       if: matrix.arch != 'i386'
       run: |
-        docker pull php:7.3-${{ matrix.variant }}
+        docker pull php:7.4-${{ matrix.variant }}
 
     - name: Build image ${{ matrix.variant }} ${{ matrix.arch }}
       run: |

diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -57,7 +57,7 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.20; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.3; \
+    pecl install redis-5.3.4; \
     pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
@@ -131,9 +131,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v2.20.0
-LABEL org.opencontainers.image.revision="6952f414171b4352d39f316484f02e3ee9adf4bc" \
-      org.opencontainers.image.version="v2.20.0"
+ENV MONICA_VERSION v2.21.0
+LABEL org.opencontainers.image.revision="7901b24e8eed864f4e645aedb424222cd3b0ef72" \
+      org.opencontainers.image.version="v2.21.0"
 
 RUN set -ex; \
     fetchDeps=" \

diff --git a/build.sh b/build.sh
@@ -3,7 +3,7 @@ set -ex
 
 for variant in apache fpm fpm-alpine; do
 	pushd $variant
-	docker pull php:7.3-$variant
+	docker pull php:7.4-$variant
 	docker build --no-cache -t monica:$variant .
 	popd
 done

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
@@ -50,7 +50,7 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.20; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.3; \
+    pecl install redis-5.3.4; \
     pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
@@ -105,9 +105,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v2.20.0
-LABEL org.opencontainers.image.revision="6952f414171b4352d39f316484f02e3ee9adf4bc" \
-      org.opencontainers.image.version="v2.20.0"
+ENV MONICA_VERSION v2.21.0
+LABEL org.opencontainers.image.revision="7901b24e8eed864f4e645aedb424222cd3b0ef72" \
+      org.opencontainers.image.version="v2.21.0"
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -57,7 +57,7 @@ RUN set -ex; \
 # pecl will claim success even if one install fails, so we need to perform each install separately
     pecl install APCu-5.1.20; \
     pecl install memcached-3.1.5; \
-    pecl install redis-5.3.3; \
+    pecl install redis-5.3.4; \
     pecl install imagick-3.4.4; \
     \
     docker-php-ext-enable \
@@ -117,9 +117,9 @@ RUN set -ex; \
 WORKDIR /var/www/html
 
 # Define Monica version
-ENV MONICA_VERSION v2.20.0
-LABEL org.opencontainers.image.revision="6952f414171b4352d39f316484f02e3ee9adf4bc" \
-      org.opencontainers.image.version="v2.20.0"
+ENV MONICA_VERSION v2.21.0
+LABEL org.opencontainers.image.revision="7901b24e8eed864f4e645aedb424222cd3b0ef72" \
+      org.opencontainers.image.version="v2.21.0"
 
 RUN set -ex; \
     fetchDeps=" \