Browse code
Upgrade docker to 1.12.0
Change-Id: I9201eb682fdc28f379303618978b6c6be6ac5a16
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1277
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: suezzelur <anishs@vmware.com>
suezzelur authored on 2016/08/10 02:47:15Showing 2 changed files
| ... | ... |
@@ -4,7 +4,7 @@ Documentation=https://containerd.tools/ |
| 4 | 4 |
After=network.target |
| 5 | 5 |
|
| 6 | 6 |
[Service] |
| 7 |
-ExecStart=/usr/bin/docker-containerd --listen /run/containerd.sock --runtime /usr/bin/docker-runc |
|
| 7 |
+ExecStart=/usr/bin/docker-containerd --listen unix:///run/containerd.sock --runtime /usr/bin/docker-runc --shim /usr/bin/docker-containerd-shim |
|
| 8 | 8 |
LimitNOFILE=1048576 |
| 9 | 9 |
LimitNPROC=1048576 |
| 10 | 10 |
LimitCORE=infinity |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
Summary: Docker |
| 2 | 2 |
Name: docker |
| 3 |
-Version: 1.11.2 |
|
| 3 |
+Version: 1.12.0 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: ASL 2.0 |
| 6 | 6 |
URL: http://docs.docker.com |
| ... | ... |
@@ -8,7 +8,7 @@ Group: Applications/File |
| 8 | 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=1bfd065784e0f422c000d86da4feda87cd63ced8 |
|
| 11 |
+%define sha1 docker=92839410a37ed1940b7a93dcd21fd9aa85d673a1 |
|
| 12 | 12 |
Source1: docker.service |
| 13 | 13 |
Source2: docker-containerd.service |
| 14 | 14 |
BuildRequires: systemd |
| ... | ... |
@@ -51,6 +51,8 @@ rm -rf %{buildroot}/*
|
| 51 | 51 |
/lib/systemd/system/docker-containerd.service |
| 52 | 52 |
|
| 53 | 53 |
%changelog |
| 54 |
+* Tue Aug 09 2016 Anish Swaminathan <anishs@vmware.com> 1.12.0-1 |
|
| 55 |
+- Upgraded to version 1.12.0 |
|
| 54 | 56 |
* Tue Jun 28 2016 Anish Swaminathan <anishs@vmware.com> 1.11.2-1 |
| 55 | 57 |
- Upgraded to version 1.11.2 |
| 56 | 58 |
* Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com> 1.11.0-6 |