From f51ad14c1b1dc41ca84da20c1e058acf924bcb21 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Tue, 3 Nov 2020 02:50:35 +0100
Subject: [PATCH 1/2] Cleanup dependencies in docker image

Replace ghostscript with gsfonts, the captcha only needs gsfonts to
work.
---
 docker/develop/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile
index cf51b3fb8..ca2a5b17d 100644
--- a/docker/develop/Dockerfile
+++ b/docker/develop/Dockerfile
@@ -2,12 +2,12 @@ FROM ruby:2.4.4-slim-stretch
 
 RUN DEBIAN_FRONTEND=noninteractive \
     apt-get update && \
-    apt-get install -y -qq \
+    apt-get install -y -qq --no-install-recommends \
         build-essential \
         cmake \
         curl \
-        ghostscript \
         git \
+        gsfonts \
         imagemagick \
         libcurl4-openssl-dev \
         libidn11-dev \
@@ -16,7 +16,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
         libpq-dev \
         libssl-dev \
         libxml2-dev \
-        libxslt-dev \
+        libxslt1-dev \
         nodejs \
         gosu \
     && \

From d9013250fda394a32f823acaa88598fb94a859ad Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Tue, 3 Nov 2020 03:00:03 +0100
Subject: [PATCH 2/2] Upgrade docker image to ruby 2.6 and debian buster

closes #8180
---
 docker/develop/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile
index ca2a5b17d..6df7b9795 100644
--- a/docker/develop/Dockerfile
+++ b/docker/develop/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4.4-slim-stretch
+FROM ruby:2.6-slim-buster
 
 RUN DEBIAN_FRONTEND=noninteractive \
     apt-get update && \
@@ -27,7 +27,8 @@ ARG DIA_UID
 ARG DIA_GID
 
 ENV HOME="/home/diaspora" \
-    GEM_HOME="/diaspora/vendor/bundle"
+    GEM_HOME="/diaspora/vendor/bundle" \
+    OPENSSL_CONF="/etc/ssl/"
 
 RUN addgroup --gid $DIA_GID diaspora && \
     adduser \