From 2ae3ef12af53d3696829d8a14ba6e0274e0833bb Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Tue, 3 May 2022 07:04:43 +0200
Subject: [PATCH 1/3] Update to the latest Composer 2.2 version

---
 docker/php/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 48dcfd8cd..df27cce27 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -64,7 +64,7 @@ RUN npm install -g yarn
 RUN curl -L -o /usr/local/bin/envsubst https://github.com/a8m/envsubst/releases/download/v1.1.0/envsubst-`uname -s`-`uname -m`; \
     chmod +x /usr/local/bin/envsubst
 
-COPY --from=composer:2.2.10 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2.2.12 /usr/bin/composer /usr/local/bin/composer
 
 COPY entrypoint.sh /entrypoint.sh
 COPY config/ /opt/wallabag/config/

From d98806514884787777b49f8bbf48856468005649 Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Tue, 3 May 2022 07:06:15 +0200
Subject: [PATCH 2/3] Fix tests on Docker by adding missing WebP support

---
 docker/php/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index df27cce27..1d6ef85b1 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -22,6 +22,7 @@ RUN apt-get update && apt-get install -y \
         libxml2-dev \
         libpng-dev \
         libjpeg-dev \
+        libwebp-dev \
         libsqlite3-dev \
         imagemagick \
         libmagickwand-dev \
@@ -33,7 +34,7 @@ RUN apt-get update && apt-get install -y \
         git \
         build-essential \
         nodejs
-RUN docker-php-ext-configure gd --with-freetype --with-jpeg
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp
 RUN docker-php-ext-install -j "$(nproc)" \
         bcmath \
         gd \

From f1ed14b8f8cf9a5e358546bb58bf63eb4bdc9295 Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Tue, 3 May 2022 07:08:25 +0200
Subject: [PATCH 3/3] Downgrade PHP to 7.4 on Docker

---
 docker/php/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 1d6ef85b1..c2884f23b 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-fpm AS rootless
+FROM php:7.4-fpm AS rootless
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG NODE_VERSION=14