From ecc87b02722fa9ac696aa92b4bc443314b5fc52d Mon Sep 17 00:00:00 2001 From: "wansu.yoo" Date: Thu, 21 Dec 2017 13:16:03 +0900 Subject: [PATCH] Removed docker-engine.service After docker-engine was seperated as service, there is some issues about communication from docker engine via curl. So, remove it at this time, and it will be applied after fixed those isses. Signed-off-by: wansu.yoo Change-Id: I2d4e89f2e30f857f98598883f00f772def03a542 --- packaging/docker-engine.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packaging/docker-engine.spec b/packaging/docker-engine.spec index 1bf12c4..355eb3d 100755 --- a/packaging/docker-engine.spec +++ b/packaging/docker-engine.spec @@ -127,11 +127,11 @@ install -p -m 755 .%container_path/containerd/bin/containerd $RPM_BUILD_ROOT/%{_ install -p -m 755 .%container_path/containerd/bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-shim install -p -m 755 .%container_path/containerd/bin/ctr $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-ctr mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants -mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants -install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/system/%{name}.service -ln -s ../%{name}.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/ -install -m 0644 %SOURCE3 %{buildroot}/usr/lib/systemd/system/%{name}.socket -ln -s ../%{name}.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/ +### mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants +### install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/system/%{name}.service +### ln -s ../%{name}.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/ +### install -m 0644 %SOURCE3 %{buildroot}/usr/lib/systemd/system/%{name}.socket +### ln -s ../%{name}.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/ %files %manifest %{name}.manifest @@ -142,8 +142,8 @@ ln -s ../%{name}.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants /%{_bindir}/docker-containerd-shim /%{_bindir}/docker-containerd-ctr /%{_bindir}/docker-runc -/usr/lib/systemd/system/%{name}.service -/usr/lib/systemd/system/multi-user.target.wants/%{name}.service -/usr/lib/systemd/system/%{name}.socket -/usr/lib/systemd/system/sockets.target.wants/%{name}.socket +### /usr/lib/systemd/system/%{name}.service +### /usr/lib/systemd/system/multi-user.target.wants/%{name}.service +### /usr/lib/systemd/system/%{name}.socket +### /usr/lib/systemd/system/sockets.target.wants/%{name}.socket %license .%docker_path/engine/LICENSE -- 2.7.4