Change-Id: Ibedea7cfc66ca468a5dd427955451a8c71ebb6af
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4655
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Bo Gan <ganb@vmware.com>
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: Docker |
| 4 | 4 |
Name: docker |
| 5 | 5 |
Version: 17.06.0 |
| 6 |
-Release: 2%{?dist}
|
|
| 6 |
+Release: 3%{?dist}
|
|
| 7 | 7 |
License: ASL 2.0 |
| 8 | 8 |
URL: http://docs.docker.com |
| 9 | 9 |
Group: Applications/File |
| ... | ... |
@@ -24,6 +24,7 @@ Source4: https://github.com/krallin/tini/tree/tini-949e6fa.tar.gz |
| 24 | 24 |
%define sha1 tini=e1a0e72ff74e1486e0701dd52983014777a7d949 |
| 25 | 25 |
Source5: https://github.com/cpuguy83/go-md2man/tree/go-md2man-a65d4d2.tar.gz |
| 26 | 26 |
%define sha1 go-md2man=e3d0865c583150f7c76e385a8b4a3f2432ca8ad8 |
| 27 |
+Source6: default-disable.preset |
|
| 27 | 28 |
Patch0: remove-firewalld.patch |
| 28 | 29 |
Patch1: CVE-2017-14992.patch |
| 29 | 30 |
|
| ... | ... |
@@ -171,6 +172,8 @@ 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 |
|
| ... | ... |
@@ -178,6 +181,7 @@ done |
| 178 | 178 |
if [ $1 -eq 1 ] ; then |
| 179 | 179 |
getent group docker >/dev/null || groupadd -r docker |
| 180 | 180 |
fi |
| 181 |
+%systemd_post docker.service |
|
| 181 | 182 |
|
| 182 | 183 |
%postun |
| 183 | 184 |
%systemd_postun_with_restart docker.service |
| ... | ... |
@@ -192,6 +196,7 @@ rm -rf %{buildroot}/*
|
| 192 | 192 |
%files |
| 193 | 193 |
%defattr(-,root,root) |
| 194 | 194 |
%{_unitdir}/docker.service
|
| 195 |
+%{_presetdir}/50-docker.preset
|
|
| 195 | 196 |
%{_bindir}/docker
|
| 196 | 197 |
%{_bindir}/dockerd
|
| 197 | 198 |
%{_bindir}/docker-containerd
|
| ... | ... |
@@ -215,6 +220,9 @@ rm -rf %{buildroot}/*
|
| 215 | 215 |
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
|
| 216 | 216 |
|
| 217 | 217 |
%changelog |
| 218 |
+* Mon Jan 15 2018 Bo Gan <ganb@vmware.com> 17.06.0-3 |
|
| 219 |
+- disable docker service by default |
|
| 220 |
+- Fix post scriptlet to invoke systemd_post |
|
| 218 | 221 |
* Thu Dec 21 2017 Kumar Kaushik <kaushikk@vmware.com> 17.06.0-2 |
| 219 | 222 |
- Applying patch for CVE-2017-14992 |
| 220 | 223 |
* Tue Jul 18 2017 Bo Gan <ganb@vmware.com> 17.06.0-1 |