Change-Id: I425a1f58f41ff3115ac5464c4f521cdf3533a35a
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3848
Reviewed-by: Sharath George
Tested-by: Sharath George
... | ... |
@@ -4,7 +4,7 @@ |
4 | 4 |
Summary: Docker |
5 | 5 |
Name: docker |
6 | 6 |
Version: 17.06.0 |
7 |
-Release: 3%{?dist} |
|
7 |
+Release: 4%{?dist} |
|
8 | 8 |
License: ASL 2.0 |
9 | 9 |
URL: http://docs.docker.com |
10 | 10 |
Group: Applications/File |
... | ... |
@@ -25,6 +25,7 @@ Source4: https://github.com/krallin/tini/tree/tini-949e6fa.tar.gz |
25 | 25 |
%define sha1 tini=e1a0e72ff74e1486e0701dd52983014777a7d949 |
26 | 26 |
Source5: https://github.com/cpuguy83/go-md2man/tree/go-md2man-a65d4d2.tar.gz |
27 | 27 |
%define sha1 go-md2man=e3d0865c583150f7c76e385a8b4a3f2432ca8ad8 |
28 |
+Source6: default-disable.preset |
|
28 | 29 |
Patch0: remove-firewalld.patch |
29 | 30 |
|
30 | 31 |
BuildRequires: systemd |
... | ... |
@@ -171,14 +172,16 @@ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do |
171 | 171 |
cp "cli/$cli_file" "build-docs/cli-$cli_file" |
172 | 172 |
done |
173 | 173 |
|
174 |
+install -v -D -m 0644 %{SOURCE6} %{buildroot}%{_presetdir}/50-docker.preset |
|
175 |
+ |
|
174 | 176 |
%preun |
175 | 177 |
%systemd_preun docker.service |
176 | 178 |
|
177 | 179 |
%post |
178 |
-%systemd_post docker.service |
|
179 | 180 |
if [ $1 -eq 1 ] ; then |
180 | 181 |
getent group docker >/dev/null || groupadd -r docker |
181 | 182 |
fi |
183 |
+%systemd_post docker.service |
|
182 | 184 |
|
183 | 185 |
%postun |
184 | 186 |
%systemd_postun_with_restart docker.service |
... | ... |
@@ -193,6 +196,7 @@ rm -rf %{buildroot}/* |
193 | 193 |
%files |
194 | 194 |
%defattr(-,root,root) |
195 | 195 |
%{_unitdir}/docker.service |
196 |
+%{_presetdir}/50-docker.preset |
|
196 | 197 |
%{_bindir}/docker |
197 | 198 |
%{_bindir}/dockerd |
198 | 199 |
%{_bindir}/docker-containerd |
... | ... |
@@ -216,6 +220,8 @@ rm -rf %{buildroot}/* |
216 | 216 |
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim |
217 | 217 |
|
218 | 218 |
%changelog |
219 |
+* Fri Sep 22 2017 Bo Gan <ganb@vmware.com> 17.06.0-4 |
|
220 |
+- disable docker service by default |
|
219 | 221 |
* Fri Sep 08 2017 Bo Gan <ganb@vmware.com> 17.06.0-3 |
220 | 222 |
- Fix post scriptlet to invoke systemd_post |
221 | 223 |
* Mon Aug 28 2017 Alexey Makhalov <amakhalov@vmware.com> 17.06.0-2 |