From 742ea3cdf77f1cf8edd51a03475bef1f28790e93 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 24 2019 13:00:35 +0000 Subject: import docker-1.13.1-96.gitb2f74b2.el7 --- diff --git a/.docker.metadata b/.docker.metadata index 58cc027..bae692f 100644 --- a/.docker.metadata +++ b/.docker.metadata @@ -5,6 +5,6 @@ c5e6169ea101c97d94257f48fa227f5ff0501454 SOURCES/docker-lvm-plugin-20a1f68.tar.g 0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz 656b1d1605dc43d7f5c00cedadd686dbd418d285 SOURCES/libnetwork-c5d66a0.tar.gz 965d64f5a81c3a428ca3b29495ecf66748c67c1f SOURCES/rhel-push-plugin-af9107b.tar.gz -59482abd62fc50a2b4fbf5ad79b4414a1963aeeb SOURCES/runc-df5c38a.tar.gz +671e9be27aaef6c534eba2f7cca4c6fbc75613b6 SOURCES/runc-9c3c5f8.tar.gz 7941233b1ed34afdc074e74ab26a86dea20ee7d4 SOURCES/tini-fec3683.tar.gz 496f9927f4254508ea1cd94f473b5b9321d41245 SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/.gitignore b/.gitignore index 552ea32..fa2489b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,6 @@ SOURCES/docker-lvm-plugin-20a1f68.tar.gz SOURCES/docker-novolume-plugin-385ec70.tar.gz SOURCES/libnetwork-c5d66a0.tar.gz SOURCES/rhel-push-plugin-af9107b.tar.gz -SOURCES/runc-df5c38a.tar.gz +SOURCES/runc-9c3c5f8.tar.gz SOURCES/tini-fec3683.tar.gz SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SPECS/docker.spec b/SPECS/docker.spec index bcf24e9..8ca0b3c 100644 --- a/SPECS/docker.spec +++ b/SPECS/docker.spec @@ -56,7 +56,7 @@ # docker-runc %global git_runc https://github.com/projectatomic/runc -%global commit_runc df5c38a9167e87f53a9894d77c0950e178a745e7 +%global commit_runc 9c3c5f853ebf0ffac0d087e94daef462133b69c7 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) # docker-containerd @@ -77,7 +77,7 @@ Name: %{repo} Epoch: 2 Version: 1.13.1 -Release: 94.git%{shortcommit_docker}%{?dist} +Release: 96.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{import_path} @@ -741,6 +741,14 @@ fi %{_bindir}/%{name}-v1.10-migrator-* %changelog +* Tue Apr 02 2019 Lokesh Mandvekar - 2:1.13.1-96.gitb2f74b2 +- Resolves: #1695305 +- built docker-runc @projectatomic/docker-1.13.1-rhel commit 9c3c5f8 + +* Tue Apr 02 2019 Lokesh Mandvekar - 2:1.13.1-95.gitb2f74b2 +- Resolves: #1587898 +- built docker-runc @projectatomic/docker-1.13.1-rhel commit 16883c4 + * Tue Feb 26 2019 Lokesh Mandvekar - 2:1.13.1-94.gitb2f74b2 - Resolves: #1556901, #1678096 - built docker-runc @projectatomic/docker-1.13.1-rhel commit df5c38a