add daemon.json with overlay2 to fix container startup issue

Added a daemon.json file to set "overlay2" as the storage driver
and moved Docker’s data directory to /opt/docker-data. This change
makes sure Docker starts properly on EMT OS.

Also updated the spec file to install this config and copy any existing
Docker data to the new location.

Signed-off-by: Polmoorx Shiva Kumar <polmoorx.shiva.kumar@intel.com>

Author: polmoorx

SPECS/moby-engine/daemon.json

@@ -0,0 +1,4 @@
+{
+  "data-root": "/opt/docker-data",
+  "storage-driver": "overlay2"
+}

SPECS/moby-engine/docker.service

@@ -11,6 +11,7 @@ Type=notify
 # the default is not to use systemd for cgroups because the delegate issues still
 # exists and systemd currently does not support the cgroup feature set required
 # for containers run by docker
+ExecStartPre=/usr/bin/mkdir -p /opt/docker-data
 ExecStart=/usr/bin/dockerd -H fd:// --containerd=/run/containerd/containerd.sock --exec-opt native.cgroupdriver=systemd
 ExecReload=/bin/kill -s HUP $MAINPID
 TimeoutSec=0
@@ -44,4 +45,4 @@ Delegate=yes
 KillMode=process
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

SPECS/moby-engine/moby-engine.signatures.json

@@ -1,6 +1,7 @@
 {
  "Signatures": {
-  "docker.service": "b150b3ce0947a65c655ed09dfe4e48b7464c60542f9f9902330288bbf87af38e",
+  "daemon.json": "b4995b275fd2a7ffe2533360832f81b452c38b90e0bd1126d8af6e02fc6ed4a2",
+  "docker.service": "0f46584cc59ffefa4ca0b59faacce68ed4c5af55fdee3c816f7f81bd65fa6ac2",
   "docker.socket": "51a06786cae46bc63b7314c25d0bd5bb2e676120d80874b99e35bf60d0b0ffa8",
   "moby-engine-25.0.3.tar.gz": "4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590"
  }

SPECS/moby-engine/moby-engine.spec

@@ -3,7 +3,7 @@
 Summary: The open-source application container engine
 Name:    moby-engine
 Version: 25.0.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: ASL 2.0
 Group:   Tools/Container
 URL: https://mobyproject.org
@@ -13,6 +13,7 @@ Distribution: Azure Linux
 Source0: https://github.com/moby/moby/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1: docker.service
 Source2: docker.socket
+Source3: daemon.json
 
 Patch0:  CVE-2022-2879.patch
 Patch1:  enable-docker-proxy-libexec-search.patch
@@ -103,11 +104,21 @@ mkdir -p %{buildroot}%{_unitdir}
 install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/docker.service
 install -p -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/docker.socket
 
+mkdir -p -m 755 %{buildroot}%{_sysconfdir}/docker
+install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/docker/daemon.json
+
 %post
 if ! grep -q "^docker:" /etc/group; then
     groupadd --system docker
 fi
 
+mkdir -p /opt/docker-data
+chmod 0700 /opt/docker-data
+
+if [ -d /var/lib/docker ] && [ ! -d /opt/docker-data/image ]; then
+    rsync -a /var/lib/docker/ /opt/docker-data/ 2>/dev/null || true
+fi
+
 %preun
 %systemd_preun docker.service
 
@@ -118,10 +129,16 @@ fi
 %license LICENSE NOTICE
 %{_bindir}/dockerd
 %{_libexecdir}/docker-proxy
+%dir /opt/docker-data
+%dir %{_sysconfdir}/docker
+%config(noreplace) %{_sysconfdir}/docker/daemon.json
 %{_sysconfdir}/*
 %{_unitdir}/*
 
 %changelog
+* Tue Jul 28 2025 Polmoorx Shiva Kumar <polmoorx.shiva.kumar@intel.com> - 25.0.3-14
+- Add daemon.json with overlay2 to fix container startup issue
+
 * Fri May 30 2025 Ranjan Dutta <ranjan.dutta@intel.com> - 25.0.3-13
 - merge from Azure Linux 3.0.20250521-3.0
 - Patch CVE-2025-30204

toolkit/imageconfigs/additionalconfigs/layout.env

@@ -49,6 +49,10 @@ PERSISTENT_BIND_PATHS+="
 # reporting-agent
 PERSISTENT_BIND_PATHS+="
   /etc/edge-node/metrics"
+# Docker persistent data directory
+PERSISTENT_BIND_PATHS+="
+  /opt/docker-data"
+
 export PERSISTENT_BIND_PATHS
 
 export PERSISTENT_BIND_TARGET="/opt/.mount/persistence"