diff --git a/SPECS/moby-engine/docker.socket b/SPECS/moby-engine/docker.socket index 330a1772bc..ebf32bf08f 100644 --- a/SPECS/moby-engine/docker.socket +++ b/SPECS/moby-engine/docker.socket @@ -3,7 +3,7 @@ Description=Docker Socket for the API PartOf=docker.service [Socket] -ListenStream=/var/run/docker.sock +ListenStream=/run/docker.sock SocketMode=0660 SocketUser=root SocketGroup=docker diff --git a/SPECS/moby-engine/moby-engine.signatures.json b/SPECS/moby-engine/moby-engine.signatures.json index dcca0b84dd..9e44db9af8 100644 --- a/SPECS/moby-engine/moby-engine.signatures.json +++ b/SPECS/moby-engine/moby-engine.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "docker.service": "b150b3ce0947a65c655ed09dfe4e48b7464c60542f9f9902330288bbf87af38e", - "docker.socket": "51a06786cae46bc63b7314c25d0bd5bb2e676120d80874b99e35bf60d0b0ffa8", + "docker.socket": "cc1b8bd06696541caa64ec96694f1b7aacae8394286125463ead25fb4286b37d", "moby-engine-25.0.3.tar.gz": "4cdb516f5d6f5caf8b3bcf93c2962277ba727cfd2d1620176a3bb0cf153b3590" } } diff --git a/SPECS/moby-engine/moby-engine.spec b/SPECS/moby-engine/moby-engine.spec index c644c33e0b..f9811a69db 100644 --- a/SPECS/moby-engine/moby-engine.spec +++ b/SPECS/moby-engine/moby-engine.spec @@ -3,12 +3,12 @@ Summary: The open-source application container engine Name: moby-engine Version: 25.0.3 -Release: 11%{?dist} +Release: 12%{?dist} License: ASL 2.0 Group: Tools/Container URL: https://mobyproject.org -Vendor: Microsoft Corporation -Distribution: Azure Linux +Vendor: Intel Corporation +Distribution: Edge Microvisor Toolkit Source0: https://github.com/moby/moby/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: docker.service @@ -87,6 +87,11 @@ GIT_COMMIT=%{commit_hash} DOCKER_GITCOMMIT=${GIT_COMMIT:0:7} DOCKER_BUILDTAGS='seccomp' hack/make.sh dynbinary %install +# Create runtime/config directories +mkdir -p %{buildroot}/var/lib/docker +mkdir -p %{buildroot}/var/log/docker +mkdir -p %{buildroot}%{_sysconfdir}/docker + mkdir -p %{buildroot}%{_bindir} install -p -m 755 ./bundles/dynbinary-daemon/dockerd %{buildroot}%{_bindir}/dockerd @@ -105,6 +110,9 @@ if ! grep -q "^docker:" /etc/group; then groupadd --system docker fi +%{_bindir}/systemctl enable docker +%{_bindir}/systemctl start docker + %preun %systemd_preun docker.service @@ -117,8 +125,14 @@ fi %{_libexecdir}/docker-proxy %{_sysconfdir}/* %{_unitdir}/* +/var/lib/docker +/var/log/docker +%dir %{_sysconfdir}/docker %changelog +* Fri May 2 2025 Mah Yock Gen - 25.0.3-12 +- Enable Docker service to start during system initialization + * Fri Mar 21 2025 Anuj Mittal - 25.0.3-11 - Bump Release to rebuild diff --git a/toolkit/imageconfigs/additionalconfigs/layout.env b/toolkit/imageconfigs/additionalconfigs/layout.env index 84089bd257..f9ad369079 100644 --- a/toolkit/imageconfigs/additionalconfigs/layout.env +++ b/toolkit/imageconfigs/additionalconfigs/layout.env @@ -43,6 +43,12 @@ PERSISTENT_BIND_PATHS+=" # platform-update-agent package PERSISTENT_BIND_PATHS+=" /var/edge-node/pua" +# docker +PERSISTENT_BIND_PATHS+=" + /var/lib/docker + /var/log/docker + /etc/docker + /usr/lib/systemd/system/docker.service" export PERSISTENT_BIND_PATHS export PERSISTENT_BIND_TARGET="/opt/.mount/persistence" diff --git a/toolkit/imageconfigs/edge-image-dev.json b/toolkit/imageconfigs/edge-image-dev.json index b8990a20af..b0d17d843f 100644 --- a/toolkit/imageconfigs/edge-image-dev.json +++ b/toolkit/imageconfigs/edge-image-dev.json @@ -74,7 +74,8 @@ "packagelists/selinux-full.json", "packagelists/intel-gpu-base.json", "packagelists/intel-wireless.json", - "packagelists/os-ab-update.json" + "packagelists/os-ab-update.json", + "packagelists/docker.json" ], "AdditionalFiles": { "additionalconfigs/layout.env": "/etc/layout.env", diff --git a/toolkit/imageconfigs/edge-image-rt-dev.json b/toolkit/imageconfigs/edge-image-rt-dev.json index 95387cc3fd..1ce7cdcc28 100644 --- a/toolkit/imageconfigs/edge-image-rt-dev.json +++ b/toolkit/imageconfigs/edge-image-rt-dev.json @@ -2,7 +2,7 @@ "Disks": [ { "PartitionTableType": "gpt", - "MaxSize": 2048, + "MaxSize": 3072, "Artifacts": [ { "Name": "edge-readonly-rt-dev", @@ -22,22 +22,22 @@ "boot" ], "Start": 1, - "End": 300, + "End": 512, "FsType": "fat32", "Type": "esp" }, { "Name": "rootfs", "ID": "rootfs", - "Start": 300, - "End": 1536, + "Start": 512, + "End": 2048, "FsType": "ext4", "Type": "linux-root-amd64" }, { "Name": "edge_persistent", "ID": "opt", - "Start": 1536, + "Start": 2048, "End": 0, "FsType": "ext4" } @@ -74,7 +74,8 @@ "packagelists/selinux-full.json", "packagelists/intel-gpu-base-rt.json", "packagelists/intel-wireless.json", - "packagelists/os-ab-update.json" + "packagelists/os-ab-update.json", + "packagelists/docker.json" ], "AdditionalFiles": { "additionalconfigs/layout.env": "/etc/layout.env", diff --git a/toolkit/imageconfigs/edge-image-rt.json b/toolkit/imageconfigs/edge-image-rt.json index a7cc503308..1bb7acb691 100644 --- a/toolkit/imageconfigs/edge-image-rt.json +++ b/toolkit/imageconfigs/edge-image-rt.json @@ -74,7 +74,8 @@ "packagelists/selinux-full.json", "packagelists/intel-gpu-base-rt.json", "packagelists/intel-wireless.json", - "packagelists/os-ab-update.json" + "packagelists/os-ab-update.json", + "packagelists/docker.json" ], "AdditionalFiles": { "additionalconfigs/layout.env": "/etc/layout.env", diff --git a/toolkit/imageconfigs/edge-image.json b/toolkit/imageconfigs/edge-image.json index 4c3de086c4..55a7f864ca 100644 --- a/toolkit/imageconfigs/edge-image.json +++ b/toolkit/imageconfigs/edge-image.json @@ -74,7 +74,8 @@ "packagelists/selinux-full.json", "packagelists/intel-gpu-base.json", "packagelists/intel-wireless.json", - "packagelists/os-ab-update.json" + "packagelists/os-ab-update.json", + "packagelists/docker.json" ], "AdditionalFiles": { "additionalconfigs/layout.env": "/etc/layout.env", diff --git a/toolkit/imageconfigs/packagelists/docker.json b/toolkit/imageconfigs/packagelists/docker.json new file mode 100644 index 0000000000..6da8f91558 --- /dev/null +++ b/toolkit/imageconfigs/packagelists/docker.json @@ -0,0 +1,6 @@ +{ + "packages": [ + "moby-engine", + "docker-cli" + ] +}