From 707b9872e667e39daa3489f69beffc141077c1d6 Mon Sep 17 00:00:00 2001
From: LoveIsGrief <loveisgrief@tuta.io>
Date: Sun, 27 Sep 2020 13:56:58 +0200
Subject: [PATCH 1/2] docker: use defaults file for setup wizard

This allows the user to have preconfigured defaults for their container.
---
 Dockerfile                                                     | 3 ++-
 .../MuWire.properties => etc/muwire/MuWire.default.properties} | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename docker/rootfs/{muwire/.MuWire/MuWire.properties => etc/muwire/MuWire.default.properties} (100%)

diff --git a/Dockerfile b/Dockerfile
index 19520b19..e47c0795 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,7 +47,8 @@ COPY docker/rootfs/ /
 
 # Set environment variables.
 ENV APP_NAME="MuWire" \
-    S6_KILL_GRACETIME=8000
+    S6_KILL_GRACETIME=8000 \
+    MU_WIRE_OPTS='"-Dwizard.defaults=/etc/muwire/MuWire.default.properties"'
 
 # Define mountable directories.
 VOLUME ["$APP_HOME/.MuWire"]
diff --git a/docker/rootfs/muwire/.MuWire/MuWire.properties b/docker/rootfs/etc/muwire/MuWire.default.properties
similarity index 100%
rename from docker/rootfs/muwire/.MuWire/MuWire.properties
rename to docker/rootfs/etc/muwire/MuWire.default.properties

From 4708affb81fa5264b3694aec60ed3bd9ceb86f80 Mon Sep 17 00:00:00 2001
From: LoveIsGrief <loveisgrief@tuta.io>
Date: Sun, 27 Sep 2020 13:57:39 +0200
Subject: [PATCH 2/2] docker: Use 48x48 icon

Allows for a better favicon
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e47c0795..6a77f49b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,7 @@ RUN \
 
 # Generate and install favicons.
 RUN \
-    APP_ICON_URL=https://github.com/zlatinb/muwire/raw/master/gui/griffon-app/resources/MuWire-128x128.png && \
+    APP_ICON_URL=https://github.com/zlatinb/muwire/raw/master/gui/griffon-app/resources/MuWire-48x48.png && \
     install_app_icon.sh "$APP_ICON_URL"
 
 # Add files.