Browse code
Update docker
Change-Id: I3bde4345c5aec4e59842430ecf71895c9f56c64e
Reviewed-on: http://photon-jenkins.eng.vmware.com/728
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
suezzelur authored on 2016/04/16 10:43:55Showing 3 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,13 @@ |
| 0 |
+[Unit] |
|
| 1 |
+Description=Containerd Daemon |
|
| 2 |
+Documentation=https://containerd.tools/ |
|
| 3 |
+After=network.target |
|
| 4 |
+ |
|
| 5 |
+[Service] |
|
| 6 |
+ExecStart=/usr/bin/docker-containerd --listen /run/containerd.sock --runtime /usr/bin/docker-runc |
|
| 7 |
+LimitNOFILE=1048576 |
|
| 8 |
+LimitNPROC=1048576 |
|
| 9 |
+LimitCORE=infinity |
|
| 10 |
+ |
|
| 11 |
+[Install] |
|
| 12 |
+WantedBy=multi-user.target |
| 0 | 13 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,20 @@ |
| 0 |
+[Unit] |
|
| 1 |
+Description=Docker Daemon |
|
| 2 |
+Documentation=http://docs.docker.com |
|
| 3 |
+Wants=network-online.target |
|
| 4 |
+After=network-online.target docker-containerd.service |
|
| 5 |
+Requires=docker-containerd.service |
|
| 6 |
+ |
|
| 7 |
+[Service] |
|
| 8 |
+Type=notify |
|
| 9 |
+ExecStart=/usr/bin/docker daemon \ |
|
| 10 |
+ --containerd /run/containerd.sock |
|
| 11 |
+ExecReload=/bin/kill -HUP $MAINPID |
|
| 12 |
+KillMode=process |
|
| 13 |
+Restart=on-abnormal |
|
| 14 |
+LimitNOFILE=1048576 |
|
| 15 |
+LimitNPROC=1048576 |
|
| 16 |
+LimitCORE=infinity |
|
| 17 |
+ |
|
| 18 |
+[Install] |
|
| 19 |
+WantedBy=multi-user.target |
| ... | ... |
@@ -1,58 +1,41 @@ |
| 1 |
-Summary: Docker |
|
| 2 |
-Name: docker |
|
| 3 |
-Version: 1.10.2 |
|
| 4 |
-Release: 1%{?dist}
|
|
| 5 |
-License: ASL 2.0 |
|
| 6 |
-URL: http://docs.docker.com |
|
| 7 |
-Group: Applications/File |
|
| 8 |
-Vendor: VMware, Inc. |
|
| 1 |
+Summary: Docker |
|
| 2 |
+Name: docker |
|
| 3 |
+Version: 1.11.0 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 |
+License: ASL 2.0 |
|
| 6 |
+URL: http://docs.docker.com |
|
| 7 |
+Group: Applications/File |
|
| 8 |
+Vendor: VMware, Inc. |
|
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: https://get.docker.com/builds/Linux/x86_64/%{name}-%{version}.tgz
|
| 11 |
-%define sha1 docker=852e82ae0057f17c9a965569989abe92d0ea1606 |
|
| 12 |
- |
|
| 11 |
+%define sha1 docker=242b6a3e6def6719f5002a4d3d5b35e587036c4e |
|
| 12 |
+Source1: docker.service |
|
| 13 |
+Source2: docker-containerd.service |
|
| 13 | 14 |
BuildRequires: systemd |
| 14 | 15 |
Requires: systemd |
| 15 | 16 |
|
| 16 | 17 |
%description |
| 17 | 18 |
Docker is a platform for developers and sysadmins to develop, ship and run applications. |
| 18 | 19 |
%prep |
| 19 |
-%setup -qn usr |
|
| 20 |
+%setup -qn docker |
|
| 20 | 21 |
%build |
| 21 | 22 |
%install |
| 22 | 23 |
install -vdm755 %{buildroot}/usr/bin
|
| 23 |
-mv -v local/bin/* %{buildroot}/usr/bin/
|
|
| 24 |
-chmod +x %{buildroot}/usr/bin/docker
|
|
| 24 |
+mv -v %{_builddir}/%{name}/* %{buildroot}/usr/bin/
|
|
| 25 | 25 |
install -vd %{buildroot}/lib/systemd/system
|
| 26 |
- |
|
| 27 |
-cat > %{buildroot}/lib/systemd/system/docker.service <<- "EOF"
|
|
| 28 |
-[Unit] |
|
| 29 |
-Description=Docker Daemon |
|
| 30 |
-Wants=network-online.target |
|
| 31 |
-After=network-online.target |
|
| 32 |
- |
|
| 33 |
-[Service] |
|
| 34 |
-ExecStart=/bin/docker daemon -s overlay |
|
| 35 |
-ExecReload=/bin/kill -HUP $MAINPID |
|
| 36 |
-KillMode=process |
|
| 37 |
-Restart=always |
|
| 38 |
-MountFlags=slave |
|
| 39 |
-LimitNOFILE=1048576 |
|
| 40 |
-LimitNPROC=1048576 |
|
| 41 |
-LimitCORE=infinity |
|
| 42 |
- |
|
| 43 |
-[Install] |
|
| 44 |
-WantedBy=multi-user.target |
|
| 45 |
- |
|
| 46 |
-EOF |
|
| 26 |
+cp %{SOURCE1} %{buildroot}/lib/systemd/system/docker.service
|
|
| 27 |
+cp %{SOURCE2} %{buildroot}/lib/systemd/system/docker-containerd.service
|
|
| 47 | 28 |
|
| 48 | 29 |
%{_fixperms} %{buildroot}/*
|
| 49 | 30 |
%check |
| 50 | 31 |
make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 51 | 32 |
%preun |
| 52 | 33 |
/bin/systemctl disable docker.service |
| 34 |
+/bin/systemctl disable docker-containerd.service |
|
| 53 | 35 |
|
| 54 | 36 |
%post |
| 55 | 37 |
/sbin/ldconfig |
| 38 |
+#/bin/systemctl enable docker-containerd.service |
|
| 56 | 39 |
#/bin/systemctl enable docker.service |
| 57 | 40 |
|
| 58 | 41 |
%postun -p /sbin/ldconfig |
| ... | ... |
@@ -64,7 +47,11 @@ rm -rf %{buildroot}/*
|
| 64 | 64 |
%defattr(-,root,root) |
| 65 | 65 |
%{_bindir}
|
| 66 | 66 |
/lib/systemd/system/docker.service |
| 67 |
+/lib/systemd/system/docker-containerd.service |
|
| 68 |
+ |
|
| 67 | 69 |
%changelog |
| 70 |
+* Fri Apr 15 2016 Anish Swaminathan <anishs@vmware.com> 1.11.0-1 |
|
| 71 |
+- Updated to version 1.11.0. |
|
| 68 | 72 |
* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 1.10.2-1 |
| 69 | 73 |
- Upgraded to version 1.10.2 |
| 70 | 74 |
* Thu Dec 10 2015 Xiaolin Li <xiaolinl@vmware.com> 1.9.0-2 |
| ... | ... |
@@ -78,7 +65,7 @@ rm -rf %{buildroot}/*
|
| 78 | 78 |
- Update to new version. |
| 79 | 79 |
* Mon May 18 2015 Touseef Liaqat <tliaqat@vmware.com> 1.6.0-3 |
| 80 | 80 |
- Update according to UsrMove. |
| 81 |
-* Fri May 15 2015 Divya Thaluru <dthaluru@vmware.com> 1.6.0-2 |
|
| 82 |
-- Updated to version 1.6 |
|
| 83 |
-* Mon Mar 4 2015 Divya Thaluru <dthaluru@vmware.com> 1.5.0-1 |
|
| 84 |
-- Initial build. First version |
|
| 81 |
+* Fri May 15 2015 Divya Thaluru <dthaluru@vmware.com> 1.6.0-2 |
|
| 82 |
+- Updated to version 1.6 |
|
| 83 |
+* Mon Mar 4 2015 Divya Thaluru <dthaluru@vmware.com> 1.5.0-1 |
|
| 84 |
+- Initial build. First version |