From 43e76d4d3ab802d24428227cdb57866b735b35e7 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sun, 12 Jul 2020 22:37:03 +0200
Subject: [PATCH] Revert "Switch to alpine"

This reverts commit b998b9bc3f79b5ca1276aa29cc491d5003f4479c.
---
 Dockerfile                   | 18 ++++++++++--------
 entrypoint.sh                |  2 +-
 nginx.conf                   |  2 +-
 services/deluge-web/run      |  2 +-
 services/deluge_exporter/run |  2 +-
 services/deluged/run         |  2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 806a771..9aa31d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,15 @@
-FROM alpine:edge
+FROM debian:testing-slim
 
-RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories \
-    && apk add --no-cache \
-        deluge \
+RUN apt-get update \
+    && apt-get -y install --no-install-recommends runit \
+    && apt-get -y install \
+        deluge-console \
+        deluge-web \
+        deluged \
         git \
-        nginx \
-        py3-pip \
-        runit \
-        su-exec \
+        gosu \
+        nginx-light \
+        python3-pip \
         tini
 
 RUN git clone --depth=1 https://github.com/tobbez/deluge_exporter /opt/deluge_exporter \
diff --git a/entrypoint.sh b/entrypoint.sh
index 874699b..4e0ee4b 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 set -u
-adduser -D -u $PUID deluge
+adduser -q --gecos '' --disabled-password --uid $PUID deluge
 chown deluge:deluge /download/ /config/
 exec tini -- runsvdir /etc/service/
diff --git a/nginx.conf b/nginx.conf
index d62d679..74d8624 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,5 +1,5 @@
 # vim: set et sts=4 sw=4 ts=4:
-user nginx;
+user www-data;
 worker_processes auto;
 pid /run/nginx.pid;
 
diff --git a/services/deluge-web/run b/services/deluge-web/run
index a58e74d..8ca9db2 100755
--- a/services/deluge-web/run
+++ b/services/deluge-web/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-su-exec deluge deluge-web -d -c /config
+gosu deluge deluge-web -d -c /config
diff --git a/services/deluge_exporter/run b/services/deluge_exporter/run
index 6d3c25a..e65d5bd 100755
--- a/services/deluge_exporter/run
+++ b/services/deluge_exporter/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-DELUGE_CONFIG_DIR=/config/ su-exec deluge /opt/deluge_exporter/deluge_exporter.py
+DELUGE_CONFIG_DIR=/config/ gosu deluge /opt/deluge_exporter/deluge_exporter.py
diff --git a/services/deluged/run b/services/deluged/run
index 853db14..ab83157 100755
--- a/services/deluged/run
+++ b/services/deluged/run
@@ -1,2 +1,2 @@
 #!/bin/sh
-su-exec deluge deluged -d -c /config -L warning
+gosu deluge deluged -d -c /config -L warning