diff --git a/.gitignore b/.gitignore index fe140fa..db2744d 100644 --- a/.gitignore +++ b/.gitignore @@ -176,3 +176,7 @@ /libnetwork-19279f0.tar.gz /runc-b425831.tar.gz /tini-fec3683.tar.gz +/containerd-42e825a.tar.gz +/docker-9cb56fd.tar.gz +/docker-lvm-plugin-20a1f68.tar.gz +/libnetwork-d00ceed.tar.gz diff --git a/docker.spec b/docker.spec index 8c336d9..7963ed1 100644 --- a/docker.spec +++ b/docker.spec @@ -42,7 +42,7 @@ # docker %global git_docker https://github.com/projectatomic/docker -%global commit_docker af6b32b92fa48010c419e25c4b43b837d852bb8e +%global commit_docker 9cb56fd9a24a26e9d87725252e0023102c7ce5bf %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch docker-1.13.1 @@ -72,7 +72,7 @@ # docker-containerd %global git_containerd https://github.com/projectatomic/containerd -%global commit_containerd 375cb680e0e35a066a6fdd576c51175ff8cd8869 +%global commit_containerd 42e825ab88335a141566a91ae2659b6b1d80ee19 %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7}) # rhel-push-plugin @@ -82,12 +82,12 @@ # docker-lvm-plugin %global git_lvm https://github.com/projectatomic/%{repo}-lvm-plugin -%global commit_lvm 66756347828c00ea1cae119e3ba5ece29f8c4582 +%global commit_lvm 20a1f68da4daecd1f7f59c5b794dd25c2f50ba02 %global shortcommit_lvm %(c=%{commit_lvm}; echo ${c:0:7}) # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork 19279f0492417475b6bfbd0aa529f73e8f178fb5 +%global commit_libnetwork d00ceed44cc447c77f25cdf5d59e83163bdcb4c9 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) # tini @@ -100,7 +100,7 @@ Name: %{repo} Epoch: 2 %endif Version: 1.13.1 -Release: 59.git%{shortcommit_docker}%{?dist} +Release: 60.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -1025,6 +1025,19 @@ exit 0 %{_unitdir}/%{repo}-lvm-plugin.* %changelog +* Sun Jul 08 2018 Lokesh Mandvekar - 2:1.13.1-60.git9cb56fd +- Resolves: #1598581, #1598583 - CVE-2018-10892 +- built docker @projectatomic/docker-1.13.1 commit 9cb56fd +- built docker-novolume-plugin commit 385ec70 +- built rhel-push-plugin commit af9107b +- built docker-lvm-plugin commit 20a1f68 +- built docker-runc @projectatomic/docker-1.13.1 commit b425831 +- built docker-containerd @projectatomic/docker-1.13.1 commit 42e825a +- built docker-init commit fec3683 +- built libnetwork commit d00ceed +- update comments in /etc/sysconfig/docker RE: registries.conf + From: Tom Sweeney + * Tue Jun 12 2018 Lokesh Mandvekar - 2:1.13.1-59.gitaf6b32b - built docker @projectatomic/docker-1.13.1 commit af6b32b - built docker-novolume-plugin commit 385ec70 diff --git a/docker.sysconfig b/docker.sysconfig index 46c5e56..7bd5a03 100644 --- a/docker.sysconfig +++ b/docker.sysconfig @@ -7,7 +7,7 @@ if [ -z "${DOCKER_CERT_PATH}" ]; then fi # Do not add registries in this file anymore. Use /etc/containers/registries.conf -# from the atomic-registries package. +# instead. For more information reference the registries.conf(5) man page. # # Location used for temporary files, such as those created by diff --git a/sources b/sources index cf05f57..22ad40b 100644 --- a/sources +++ b/sources @@ -1,9 +1,9 @@ SHA512 (container-storage-setup-65f91d4.tar.gz) = 1494e9905b9b8dbffe051161c550ea54c90e6040c141cf7bdf65274462189b51d92fe252449998ced93083769defad310f87a85163dc26e16324a337ff082518 -SHA512 (containerd-375cb68.tar.gz) = d4411eb3415f0df077889d9bf6c3a7b561a461c5e6b7a6daa16f67b62453105257c518cb703364ef4f356b158dda14f1f7d374067710fb14b2666536c145b832 -SHA512 (docker-af6b32b.tar.gz) = e4f48e2f4aacfa7a3c8d278858b527a7eb6ceb71d56ef7d5876e564926757ccf56c586c35ada0e8d454fa0c05b4151f1d661df5862f6e11186010da7cb90488e -SHA512 (docker-lvm-plugin-6675634.tar.gz) = 7853680e5e8091ab934ae533540dbe2ab81f5d3cf46acad9af1571c6c35115211c72aebe08a8bde2108c3acb23d0d4095074a9dc89b7499d450ac397fbe32632 +SHA512 (containerd-42e825a.tar.gz) = f06b5b5b19b2c5bd5e188ec2fb010bc55567ae91ed6021e74ee549836e2d4f4657db27ce129737bfb2d5b7abcbf2ee18e7d5ff4c8319fbfa512e0498dea614b0 +SHA512 (docker-9cb56fd.tar.gz) = f806d1980a6ab849f90188605e85d4823296a3af1336f123de4800165c4411c26258a2c17854ccef1751a73388fa85b7a06ac7cd6a00a43bc0fb51ec1d3f166b +SHA512 (docker-lvm-plugin-20a1f68.tar.gz) = b2d6f91f8d4910f89f5676028d465453c0ab6430b03a2c0285a2665fce4dbc27037a60494a24576ecaf31afb5e2b961e8539d550589589644c30b3dbac9a4cd6 SHA512 (docker-novolume-plugin-385ec70.tar.gz) = 267558fe8903821f0900cca4d67f7937f0cdf9d2d5be8bcdb90ce0de0931668fecb47d836debabcc00b611c71456f5c920b431083cbb8190589d11dfc978f0e8 -SHA512 (libnetwork-19279f0.tar.gz) = eeecbfbf18426842d9e7d135368d2a8d4d85c1e3f783e2371c18e1dbbe0cc47041d06f5efa86b6cc60f8ccc374ac78458afa01703b87292b8eab94d8188e0c12 +SHA512 (libnetwork-d00ceed.tar.gz) = 8da8a78c034929b7cc3cc5f79369ef7e64040876be6b74172a244608a1fdd3e20c0bc9a3d4338fe53f0e85c6dc33b1ca72626b7bf68bf00b4dbe810fc57365f8 SHA512 (rhel-push-plugin-af9107b.tar.gz) = e17c8970edff2eae4a2cc7f5a09a054171700032f2e6d15b043f3ebdb902385a95c4afed3cedd67e5d7bf4292a0b945f7c84f84f1162930fc8f365825110e573 SHA512 (runc-b425831.tar.gz) = 549f2bcab238e9bb801974e2bf6c68e69d316aea5ecf96822b99bb1cf76669f4f6ededaf430062a63d97cfe4899bc594308b142f86e5b3308ef8a712b63d16bc SHA512 (tini-fec3683.tar.gz) = ee46d21467f8bacb4e8be72f5dfcbb23c1964286e90b4b3d3bf67dbbf79a337968ac8a0042a8191e329a65398b20ea160aae3ae5ef20ee03ebae11c2083d7621