From 078d1d33c3e697a5d0b2452d2afc979f7f9aee64 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 29 2019 16:01:04 +0000
Subject: import docker-1.13.1-102.git7f2769b.el7


---

diff --git a/.docker.metadata b/.docker.metadata
index bae692f..2a46834 100644
--- a/.docker.metadata
+++ b/.docker.metadata
@@ -1,6 +1,6 @@
-82c5eac259a4161cf051893bd532409007c1ce81 SOURCES/b2f74b220126bddbae585cfe2406498ced3ae065.tar.gz
+189beff513fdcd23fe50e0289fcd0b152c03f18c SOURCES/7f2769b9e0572f62730d91e79e674efd59b7e234.tar.gz
 e21d6c1b9e04650915499946bb4e6a01727c7d54 SOURCES/container-storage-setup-413b408.tar.gz
-7fda753d7eb81e1f48fdee734a6dc898b4edf02f SOURCES/containerd-7989550.tar.gz
+0ab6f850918d4bca8b11a06d067e37e6a146d9a0 SOURCES/containerd-9c53e35.tar.gz
 c5e6169ea101c97d94257f48fa227f5ff0501454 SOURCES/docker-lvm-plugin-20a1f68.tar.gz
 0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz
 656b1d1605dc43d7f5c00cedadd686dbd418d285 SOURCES/libnetwork-c5d66a0.tar.gz
diff --git a/.gitignore b/.gitignore
index fa2489b..5f65b85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-SOURCES/b2f74b220126bddbae585cfe2406498ced3ae065.tar.gz
+SOURCES/7f2769b9e0572f62730d91e79e674efd59b7e234.tar.gz
 SOURCES/container-storage-setup-413b408.tar.gz
-SOURCES/containerd-7989550.tar.gz
+SOURCES/containerd-9c53e35.tar.gz
 SOURCES/docker-lvm-plugin-20a1f68.tar.gz
 SOURCES/docker-novolume-plugin-385ec70.tar.gz
 SOURCES/libnetwork-c5d66a0.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/SOURCES/docker.service b/SOURCES/docker.service
index 535487c..d6c28fb 100644
--- a/SOURCES/docker.service
+++ b/SOURCES/docker.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
-After=network.target rhel-push-plugin.socket registries.service
+After=network.target rhel-push-plugin.service registries.service
 Wants=docker-storage-setup.service
-Requires=rhel-push-plugin.socket registries.service
+Requires=rhel-push-plugin.service registries.service
 Requires=docker-cleanup.timer
 
 [Service]
diff --git a/SPECS/docker.spec b/SPECS/docker.spec
index 8ca0b3c..56cc824 100644
--- a/SPECS/docker.spec
+++ b/SPECS/docker.spec
@@ -23,7 +23,7 @@
 
 # docker
 %global git_docker https://github.com/projectatomic/docker
-%global commit_docker b2f74b220126bddbae585cfe2406498ced3ae065
+%global commit_docker 7f2769b9e0572f62730d91e79e674efd59b7e234
 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
 # docker_branch used in %%check
 %global docker_branch %{name}-%{version}
@@ -61,7 +61,7 @@
 
 # docker-containerd
 %global git_containerd https://github.com/projectatomic/containerd
-%global commit_containerd 7989550b83317f799af20ab4df3a5b6487767fc9
+%global commit_containerd 9c53e35c39f214b128beed3dfb670ccf751c4173
 %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7})
 
 # docker-init
@@ -77,7 +77,7 @@
 Name: %{repo}
 Epoch: 2
 Version: 1.13.1
-Release: 96.git%{shortcommit_docker}%{?dist}
+Release: 102.git%{shortcommit_docker}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{import_path}
@@ -741,6 +741,25 @@ fi
 %{_bindir}/%{name}-v1.10-migrator-*
 
 %changelog
+* Thu Jul 11 2019 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-102.git7f2769b
+- Resolves: #1727488, #1723491
+
+* Thu Jul 04 2019 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-101.git61c8524
+- Resolves: #1492113, #1653292
+- built docker @projectatomic/docker-1.13.1-rhel commit 61c8524
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 9c53e35
+
+* Tue Jun 25 2019 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-100.gite467576
+- Resolves: #1714032
+- unitfile patch from Ulrich Obergfell <uobergfe@redhat.com>
+
+* Mon Jun 24 2019 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-99.gite467576
+- Resolves: #1714722, #1717087 - CVE-2018-15664
+
+* Thu Jun 20 2019 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-98.gitb2f74b2
+- Resolves: #1720363
+- build -97 wasn't quite right, reverted and skipped from changelogs
+
 * Tue Apr 02 2019 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-96.gitb2f74b2
 - Resolves: #1695305
 - built docker-runc @projectatomic/docker-1.13.1-rhel commit 9c3c5f8