diff --git a/docker-stable.changes b/docker-stable.changes index 02df61f..640206f 100644 --- a/docker-stable.changes +++ b/docker-stable.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 12 06:34:28 UTC 2024 - Aleksa Sarai + +- Remove DOCKER_NETWORK_OPTS from docker.service. This was removed from + sysconfig a long time ago, and apparently this causes issues with systemd in + some cases. +- Update --add-runtime to point to correct binary path. + ------------------------------------------------------------------- Wed Oct 16 22:24:52 UTC 2024 - Aleksa Sarai diff --git a/docker-stable.spec b/docker-stable.spec index 6f21047..2ed434c 100644 --- a/docker-stable.spec +++ b/docker-stable.spec @@ -16,8 +16,7 @@ # # nodebuginfo -# The flavour is defined with a macro to try to keep docker and docker-stable -# as similar as possible, to make maintenance a little easier. + %define flavour -stable %bcond_without apparmor @@ -112,18 +111,18 @@ BuildRequires: fdupes %if %{with apparmor} BuildRequires: libapparmor-devel %endif +BuildRequires: fish +BuildRequires: go-go-md2man BuildRequires: libbtrfs-devel >= 3.8 BuildRequires: libseccomp-devel >= 2.2 BuildRequires: libtool BuildRequires: linux-glibc-devel BuildRequires: procps BuildRequires: sqlite3-devel -BuildRequires: zsh -BuildRequires: fish -BuildRequires: go-go-md2man -BuildRequires: pkgconfig(libsystemd) BuildRequires: sysuser-tools +BuildRequires: zsh BuildRequires: golang(API) = 1.21 +BuildRequires: pkgconfig(libsystemd) %if %{with apparmor} %if 0%{?sle_version} >= 150000 # This conditional only works on rpm>=4.13, which SLE 12 doesn't have. But we @@ -179,8 +178,8 @@ Requires(post): shadow # configured to use lvm and the user doesn't explicitly provide a # different storage-driver than devicemapper Recommends: lvm2 >= 2.2.89 -Recommends: git-core >= 1.7 Recommends: %{name}-rootless-extras +Recommends: git-core >= 1.7 ExcludeArch: s390 ppc %description @@ -225,9 +224,9 @@ Key features: Summary: Rootless support for Docker Group: System/Management Requires: %{name} = %{docker_version} -Requires: slirp4netns >= 0.4 Requires: fuse-overlayfs >= 0.7 Requires: rootlesskit +Requires: slirp4netns >= 0.4 BuildArch: noarch # docker-stable cannot be used alongside docker. %if "%{name}" == "docker-stable" diff --git a/docker.service b/docker.service index 1c3564e..1dd8b4d 100644 --- a/docker.service +++ b/docker.service @@ -16,7 +16,7 @@ EnvironmentFile=/etc/sysconfig/docker # enabled by default because enabling socket activation means that on boot your # containers won't start until someone tries to administer the Docker daemon. Type=notify -ExecStart=/usr/bin/dockerd --add-runtime oci=/usr/sbin/docker-runc $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS +ExecStart=/usr/bin/dockerd --add-runtime oci=/usr/sbin/runc $DOCKER_OPTS ExecReload=/bin/kill -s HUP $MAINPID # Having non-zero Limit*s causes performance problems due to accounting overhead