From 244e955e4e15975ac1dec6d852fb966b854ebe10 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 4 Dec 2019 00:51:55 +0100
Subject: [PATCH 1/1] Simplify Dockerfile and slim Docker image

---
 support/docker/production/Dockerfile.stretch | 24 ++++----------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch
index b6de4bd9b..720f266d3 100644
--- a/support/docker/production/Dockerfile.stretch
+++ b/support/docker/production/Dockerfile.stretch
@@ -1,36 +1,20 @@
-FROM node:10-stretch
+FROM node:10-stretch-slim
 
 # Allow to pass extra options to the npm run build
 # eg: --light --light-fr to not build all client languages
 #     (speed up build time if i18n is not required)
 ARG NPM_RUN_BUILD_OPTS
 
-RUN set -ex; \
-    if ! command -v gpg > /dev/null; then \
-      apt update; \
-      apt install -y --no-install-recommends \
-        gnupg \
-        dirmngr \
-      ; \
-      rm -rf /var/lib/apt/lists/*; \
-fi
-
 # Install dependencies
 RUN apt update \
-    && apt -y install ffmpeg \
-    && rm /var/lib/apt/lists/* -fR
+ && apt install -y --no-install-recommends ffmpeg gnupg gosu \
+ && gosu nobody true \
+ && rm /var/lib/apt/lists/* -fR
 
 # Add peertube user
 RUN groupadd -r peertube \
     && useradd -r -g peertube -m peertube
 
-# grab gosu for easy step-down from root
-RUN set -eux; \
-	apt update; \
-	apt install -y gosu; \
-	rm -rf /var/lib/apt/lists/*; \
-	gosu nobody true
-
 # Install PeerTube
 WORKDIR /app
 COPY . ./
-- 
2.41.0