From bc803571aa39534f68b710945bf6bd06ef1e350e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 25 2018 12:12:19 +0000
Subject: import docker-1.12.6-71.git3e8e77d.el7


---

diff --git a/.docker.metadata b/.docker.metadata
index fd35f36..66b1e03 100644
--- a/.docker.metadata
+++ b/.docker.metadata
@@ -1,8 +1,8 @@
+e3e41a30b84108abb71af3176bc22f0cd69b52ea SOURCES/3e8e77dcb88db0530c839b249bea7d75f9cd01d7.tar.gz
 27fe386ea4378b478fa0051976d761419aa3f070 SOURCES/container-storage-setup-8276a1e.tar.gz
 9e13309de5e468d5d68208d5fd0b7aca5e9f948e SOURCES/containerd-fa8fb3d.tar.gz
 b0ba595ce2314c59ebbd53400f7f64809331a6b9 SOURCES/docker-lvm-plugin-8647404.tar.gz
 0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz
-a9e5fd00844dc8f08a89ffd78818dfe281315159 SOURCES/ec8512ba42f349cbe5a63140c4d9c810f7afa527.tar.gz
 965d64f5a81c3a428ca3b29495ecf66748c67c1f SOURCES/rhel-push-plugin-af9107b.tar.gz
 d01d661d4fb75caa219dd9ded75a7064a30d41b6 SOURCES/runc-c5d3116.tar.gz
 496f9927f4254508ea1cd94f473b5b9321d41245 SOURCES/v1.10-migrator-c417a6a.tar.gz
diff --git a/.gitignore b/.gitignore
index d755171..f5923fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
+SOURCES/3e8e77dcb88db0530c839b249bea7d75f9cd01d7.tar.gz
 SOURCES/container-storage-setup-8276a1e.tar.gz
 SOURCES/containerd-fa8fb3d.tar.gz
 SOURCES/docker-lvm-plugin-8647404.tar.gz
 SOURCES/docker-novolume-plugin-385ec70.tar.gz
-SOURCES/ec8512ba42f349cbe5a63140c4d9c810f7afa527.tar.gz
 SOURCES/rhel-push-plugin-af9107b.tar.gz
 SOURCES/runc-c5d3116.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/SOURCES/docker.service b/SOURCES/docker.service
index 8af4c34..871f839 100644
--- a/SOURCES/docker.service
+++ b/SOURCES/docker.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
-After=network.target
+After=network.target rhel-push-plugin.socket registries.service
 Wants=docker-storage-setup.service
 Requires=rhel-push-plugin.socket registries.service
 Requires=docker-cleanup.timer
diff --git a/SPECS/docker.spec b/SPECS/docker.spec
index c955177..cc0b975 100644
--- a/SPECS/docker.spec
+++ b/SPECS/docker.spec
@@ -24,7 +24,7 @@
 
 # docker
 %global git_docker https://github.com/projectatomic/docker
-%global commit_docker ec8512ba42f349cbe5a63140c4d9c810f7afa527
+%global commit_docker 3e8e77dcb88db0530c839b249bea7d75f9cd01d7
 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
 # docker_branch used in %%check
 %global docker_branch %{name}-%{version}
@@ -68,7 +68,7 @@
 Name: %{repo}
 Epoch: 2
 Version: 1.12.6
-Release: 68.git%{shortcommit_docker}%{?dist}
+Release: 71.git%{shortcommit_docker}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{import_path}
@@ -163,7 +163,7 @@ running and skip checksum calculation on startup.
 Summary: Common files for docker and docker-latest
 Requires: device-mapper-libs >= 7:1.02.97
 Requires: oci-umount >= 2:2.0.0-1
-Requires: oci-register-machine >= 1:0-3.10
+Requires: oci-register-machine >= 1:0-3.14
 Requires: oci-systemd-hook >= 1:0.1.4-9
 Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
 Requires: subscription-manager-plugin-container
@@ -650,6 +650,16 @@ exit 0
 %{_bindir}/%{name}-v1.10-migrator-*
 
 %changelog
+* Wed Dec 13 2017 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.12.6-71.git3e8e77d
+- rebased to 3e8e77dcb88db0530c839b249bea7d75f9cd01d7
+- https://bugzilla.redhat.com/show_bug.cgi?id=1518519
+
+* Tue Dec 12 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-70.gitec8512b
+- Resolves: #1524634 - start daemon after registries.service
+
+* Wed Nov 22 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-69.gitec8512b
+- use oci-register-machine >= 1:0-3.14
+
 * Thu Nov 16 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-68.gitec8512b
 - revert some docker.sysconfig deletions wrongly done in commit 3b003db