From 66c15adbbfcccedb20ddc9d62929642bada854f2 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Wed, 7 Sep 2022 19:13:47 +0200
Subject: [PATCH] Move Docker configuration to daemon.json (#2116)

This is more readable than passing arguments to the daemon directly. It
also shortens the ExecStart command significantly, which is stored in
every log entry in systemd-journald.
---
 .../rootfs-overlay/etc/docker/daemon.json          | 11 +++++++++++
 .../systemd/system/docker.service.d/hassos.conf    |  2 --
 .../usr/lib/systemd/system/etc-docker.mount        | 14 --------------
 3 files changed, 11 insertions(+), 16 deletions(-)
 create mode 100644 buildroot-external/rootfs-overlay/etc/docker/daemon.json
 delete mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount

diff --git a/buildroot-external/rootfs-overlay/etc/docker/daemon.json b/buildroot-external/rootfs-overlay/etc/docker/daemon.json
new file mode 100644
index 000000000..a9df46281
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/docker/daemon.json
@@ -0,0 +1,11 @@
+{
+    "storage-driver": "overlay2",
+    "log-driver": "journald",
+    "experimental": true,
+    "ip6tables": true,
+    "log-opts": {
+        "tag": "{{.ImageName}}/{{.Name}}"
+    },
+    "data-root": "/mnt/data/docker",
+    "deprecated-key-path": "/mnt/overlay/etc/docker/key.json"
+}
diff --git a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf
index 0becc63d3..4e6014da7 100644
--- a/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf
+++ b/buildroot-external/rootfs-overlay/etc/systemd/system/docker.service.d/hassos.conf
@@ -2,6 +2,4 @@
 RequiresMountsFor=/etc/docker /mnt/data /var/lib/docker
 
 [Service]
-ExecStart=
-ExecStart=/usr/bin/dockerd -H fd:// --storage-driver=overlay2 --log-driver=journald --experimental --ip6tables --log-opt tag="{{.ImageName}}/{{.Name}}" --data-root /mnt/data/docker
 OOMScoreAdjust=-400
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount
deleted file mode 100644
index bb7a80cbb..000000000
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/etc-docker.mount
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Docker persistent configuration
-Requires=mnt-overlay.mount
-After=mnt-overlay.mount
-Before=docker.service
-
-[Mount]
-What=/mnt/overlay/etc/docker
-Where=/etc/docker
-Type=none
-Options=bind
-
-[Install]
-WantedBy=hassos-bind.target