From 505031f2a62d6a20519a45335f0c699505eb1056 Mon Sep 17 00:00:00 2001
From: Juho Vanhanen <juho@vanhanen.io>
Date: Mon, 6 Jul 2020 14:03:09 +0300
Subject: [PATCH 1/3] Add libwebp dependency to Dockerfile

Signed-off-by: Juho Vanhanen <juho@vanhanen.io>
---
 changelog.d/7790.docker | 1 +
 docker/Dockerfile       | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 changelog.d/7790.docker

diff --git a/changelog.d/7790.docker b/changelog.d/7790.docker
new file mode 100644
index 000000000000..ffd32234a9b7
--- /dev/null
+++ b/changelog.d/7790.docker
@@ -0,0 +1 @@
+Add libwebp so we can handle webp images.
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9a3cf7b3f528..093e89af6c56 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -24,6 +24,7 @@ RUN apk add \
         build-base \
         libffi-dev \
         libjpeg-turbo-dev \
+        libwebp-dev \
         libressl-dev \
         libxslt-dev \
         linux-headers \
@@ -61,6 +62,7 @@ FROM docker.io/python:${PYTHON_VERSION}-alpine3.11
 RUN apk add --no-cache --virtual .runtime_deps \
         libffi \
         libjpeg-turbo \
+        libwebp \
         libressl \
         libxslt \
         libpq \

From 0569dce43180fb64a4888c7b89eeb28a9b400e40 Mon Sep 17 00:00:00 2001
From: Juho Vanhanen <juho@vanhanen.io>
Date: Mon, 6 Jul 2020 14:10:30 +0300
Subject: [PATCH 2/3] Fix changelog number

Signed-off-by: Juho Vanhanen <juho@vanhanen.io>
---
 changelog.d/{7790.docker => 7791.docker} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{7790.docker => 7791.docker} (100%)

diff --git a/changelog.d/7790.docker b/changelog.d/7791.docker
similarity index 100%
rename from changelog.d/7790.docker
rename to changelog.d/7791.docker

From 0c136e2f92b3e6feeddc52f507461ac754bced5d Mon Sep 17 00:00:00 2001
From: Juho Vanhanen <juhovan@users.noreply.github.com>
Date: Mon, 6 Jul 2020 14:57:40 +0300
Subject: [PATCH 3/3] Update changelog.d/7791.docker

Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
---
 changelog.d/7791.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/7791.docker b/changelog.d/7791.docker
index ffd32234a9b7..a114159d4e17 100644
--- a/changelog.d/7791.docker
+++ b/changelog.d/7791.docker
@@ -1 +1 @@
-Add libwebp so we can handle webp images.
+Include libwebp in the Docker file to properly handle webp image uploads.