Remove handling of Docker key.json (#4361)

sairon · web-flow · commit 31f347ee0fec · 2025-10-28T18:36:57.000+01:00
The deprecated-key-path option is no longer handled, but it doesn't cause problems because the key is explicitly ignored. It was completely removed in Docker 19.03.0 [1]. As such, the option and the pre-start script to fix the corrupted key.json can be removed now, as it has no effect, only printing confusing message when Docker service fails to start. [1] http://github.com/moby/moby/commit/98fc09128b3f8221680bd22c2de5b893bd3d7ef8
diff --git a/buildroot-external/rootfs-overlay/etc/docker/daemon.json b/buildroot-external/rootfs-overlay/etc/docker/daemon.json
@@ -4,6 +4,5 @@
         "tag": "{{.Name}}"
     },
     "data-root": "/mnt/data/docker",
-    "deprecated-key-path": "/mnt/overlay/etc/docker/key.json",
     "bip": "172.30.232.1/23"
 }
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/docker.service.d/failure.conf b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/docker.service.d/failure.conf
@@ -3,4 +3,3 @@ FailureAction=reboot
 
 [Service]
 ExecStartPre=/usr/libexec/docker-disk-check
-ExecStopPost=/usr/libexec/docker-failure
diff --git a/buildroot-external/rootfs-overlay/usr/libexec/docker-failure b/buildroot-external/rootfs-overlay/usr/libexec/docker-failure

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,5 @@`
`4`	`4`	`"tag": "{{.Name}}"`
`5`	`5`	`},`
`6`	`6`	`"data-root": "/mnt/data/docker",`
`7`		`- "deprecated-key-path": "/mnt/overlay/etc/docker/key.json",`
`8`	`7`	`"bip": "172.30.232.1/23"`
`9`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,3 @@ FailureAction=reboot`
`3`	`3`
`4`	`4`	`[Service]`
`5`	`5`	`ExecStartPre=/usr/libexec/docker-disk-check`
`6`		`-ExecStopPost=/usr/libexec/docker-failure`