From 4b9a03a1105cc734439d85f6abde2a1ebd4ae4bb Mon Sep 17 00:00:00 2001
From: techknowlogick <matti@mdranta.net>
Date: Sun, 2 Feb 2020 09:10:04 +0100
Subject: [PATCH 1/4] Update docker-compose.yml to use redis v5 Fix #1021

---
 .gitlab-ci.yml            | 2 +-
 deploy/docker-compose.yml | 2 +-
 dev.yml                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57294d72b..3aa4cc56b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,7 +120,7 @@ test_api:
   interruptible: true
   services:
     - postgres:11
-    - redis:3
+    - redis:5
   stage: test
   image: funkwhale/funkwhale:develop
   cache:
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 0a4be1674..b98555ef2 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     networks:
       - default
     env_file: .env
-    image: redis:3
+    image: redis:5
     volumes:
       - ./data/redis:/data
 
diff --git a/dev.yml b/dev.yml
index 630ab68ec..a85853fff 100644
--- a/dev.yml
+++ b/dev.yml
@@ -33,7 +33,7 @@ services:
     env_file:
       - .env.dev
       - .env
-    image: redis:3.0
+    image: redis:5
     volumes:
       - "./data/${COMPOSE_PROJECT_NAME-node1}/redis:/data"
     networks:

From a06e64eb9949caeaee14b681120eca5aa08ba679 Mon Sep 17 00:00:00 2001
From: Shlee <github@shl.ee>
Date: Sun, 2 Feb 2020 09:10:50 +0100
Subject: [PATCH 2/4] Update dev.yml - Update swagger-ui docker image

---
 dev.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev.yml b/dev.yml
index a85853fff..a01b2ee0c 100644
--- a/dev.yml
+++ b/dev.yml
@@ -152,7 +152,7 @@ services:
       - "8001:8001"
 
   api-docs:
-    image: swaggerapi/swagger-ui:v3.21.0
+    image: swaggerapi/swagger-ui:v3.25
     environment:
       - "API_URL=/swagger.yml"
     ports:

From 7d6f6e851550722f62a856cd91bbb0adb72f062a Mon Sep 17 00:00:00 2001
From: techknowlogick <matti@mdranta.net>
Date: Sun, 2 Feb 2020 09:11:35 +0100
Subject: [PATCH 3/4] Allow files with upper case extensions when uploading
 avatar

Discovered when attempting to upload a file with name avatar.JPG

The following error was reported in the logs:
```
File "/app/funkwhale_api/common/serializers.py", line 213, in to_internal_value
     format=PIL.Image.EXTENSION[os.path.splitext(file_obj.name)[-1]],
 KeyError: '.JPG'
```
---
 api/funkwhale_api/common/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/funkwhale_api/common/serializers.py b/api/funkwhale_api/common/serializers.py
index c754540c9..f1f332d13 100644
--- a/api/funkwhale_api/common/serializers.py
+++ b/api/funkwhale_api/common/serializers.py
@@ -219,7 +219,7 @@ class StripExifImageField(serializers.ImageField):
         with io.BytesIO() as output:
             image_without_exif.save(
                 output,
-                format=PIL.Image.EXTENSION[os.path.splitext(file_obj.name)[-1]],
+                format=PIL.Image.EXTENSION[os.path.splitext(file_obj.name)[-1].lower()],
                 quality=100,
             )
             content = output.getvalue()

From 459e66db30b72c25ac742be495e9e43b6f7c68be Mon Sep 17 00:00:00 2001
From: techknowlogick <matti@mdranta.net>
Date: Sun, 2 Feb 2020 09:43:54 +0100
Subject: [PATCH 4/4] Add deps for pillow in docker image

---
 api/Dockerfile | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/api/Dockerfile b/api/Dockerfile
index 12a84a769..130606b41 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -19,7 +19,18 @@ RUN \
     libffi-dev         \
     make         \
     zlib-dev           \
-    openldap-dev && \
+    openldap-dev \ 
+    jpeg-dev \
+    zlib-dev \
+    freetype-dev \
+    lcms2-dev \
+    openjpeg-dev \
+    tiff-dev \
+    tk-dev \
+    tcl-dev \
+    harfbuzz-dev \
+    fribidi-dev \
+    && \
     \
     \
     ln -s /usr/bin/python3 /usr/bin/python
@@ -29,10 +40,6 @@ COPY ./requirements/base.txt /requirements/base.txt
 # hack around https://github.com/pypa/pip/issues/6158#issuecomment-456619072
 ENV PIP_DOWNLOAD_CACHE=/noop/
 RUN \
-    echo 'fixing requirements file for alpine' && \
-    sed -i '/Pillow/d' /requirements/base.txt && \
-    \
-    \
     echo 'installing pip requirements' && \
     pip3 install --upgrade pip && \
     pip3 install setuptools wheel && \