Browse code
Add to docker.service. github issue:#414
Change-Id: If8c81c79d41bb6ae4cfade7991fac3f3307f0880
Reviewed-on: http://photon-jenkins.eng.vmware.com/788
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
ppadmavilasom authored on 2016/05/01 01:11:25Showing 2 changed files
| ... | ... |
@@ -7,7 +7,8 @@ Requires=docker-containerd.service |
| 7 | 7 |
|
| 8 | 8 |
[Service] |
| 9 | 9 |
Type=notify |
| 10 |
-ExecStart=/usr/bin/docker daemon \ |
|
| 10 |
+EnvironmentFile=-/etc/default/docker |
|
| 11 |
+ExecStart=/usr/bin/docker daemon $DOCKER_OPTS \ |
|
| 11 | 12 |
--containerd /run/containerd.sock |
| 12 | 13 |
ExecReload=/bin/kill -HUP $MAINPID |
| 13 | 14 |
KillMode=process |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Docker |
| 2 | 2 |
Name: docker |
| 3 | 3 |
Version: 1.11.0 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: ASL 2.0 |
| 6 | 6 |
URL: http://docs.docker.com |
| 7 | 7 |
Group: Applications/File |
| ... | ... |
@@ -50,6 +50,8 @@ rm -rf %{buildroot}/*
|
| 50 | 50 |
/lib/systemd/system/docker-containerd.service |
| 51 | 51 |
|
| 52 | 52 |
%changelog |
| 53 |
+* Sat Apr 30 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.11.0-2 |
|
| 54 |
+- Add $DOCKER_OPTS to start in docker.service |
|
| 53 | 55 |
* Fri Apr 15 2016 Anish Swaminathan <anishs@vmware.com> 1.11.0-1 |
| 54 | 56 |
- Updated to version 1.11.0. |
| 55 | 57 |
* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.10.2-1 |