From f06bb70241158d66ec6a7f59d0048a89a554c622 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Jan 28 2018 14:47:13 +0000
Subject:  Prevent panic when X-Registry-Auth: null

 BACKPORT: Do not reuse a http.Request after a failure in callWithRetry
 BACKPORT: devicemapper: remove container rootfs mountPath after umount
 BACKPORT: devmapper: Log fstype and mount options during mount error

---

diff --git a/.gitignore b/.gitignore
index b2c713a..6629db9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,3 +156,4 @@
 /docker-4402c09.tar.gz
 /runc-1c91122.tar.gz
 /docker-584d391.tar.gz
+/docker-b186df3.tar.gz
diff --git a/docker.service b/docker.service
index 6ae8e28..a57b189 100644
--- a/docker.service
+++ b/docker.service
@@ -27,7 +27,7 @@ ExecStart=/usr/bin/dockerd-current \
           $ADD_REGISTRY \
           $BLOCK_REGISTRY \
           $INSECURE_REGISTRY \
-	  $REGISTRIES
+          $REGISTRIES
 ExecReload=/bin/kill -s HUP $MAINPID
 TasksMax=8192
 LimitNOFILE=1048576
diff --git a/docker.service.centos b/docker.service.centos
index 130b676..a09abad 100644
--- a/docker.service.centos
+++ b/docker.service.centos
@@ -3,10 +3,11 @@ Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
 After=network.target docker-containerd.service
 Wants=docker-storage-setup.service
-Requires=docker-containerd.service rhel-push-plugin.socket
+Requires=docker-containerd.service rhel-push-plugin.socket registries.service
 
 [Service]
 Type=notify
+EnvironmentFile=/run/containers/registries.conf
 EnvironmentFile=-/etc/sysconfig/docker
 EnvironmentFile=-/etc/sysconfig/docker-storage
 EnvironmentFile=-/etc/sysconfig/docker-network
@@ -18,12 +19,15 @@ ExecStart=/usr/bin/dockerd-current \
           --containerd /run/containerd.sock \
           --exec-opt native.cgroupdriver=systemd \
           --userland-proxy-path=/usr/libexec/docker/docker-proxy-current \
+          --init-path=/usr/libexec/docker/docker-init-current \
+          --seccomp-profile=/etc/docker/seccomp.json \
           $OPTIONS \
           $DOCKER_STORAGE_OPTIONS \
           $DOCKER_NETWORK_OPTIONS \
           $ADD_REGISTRY \
           $BLOCK_REGISTRY \
-          $INSECURE_REGISTRY
+          $INSECURE_REGISTRY \
+          $REGISTRIES
 ExecReload=/bin/kill -s HUP $MAINPID
 LimitNOFILE=1048576
 LimitNPROC=1048576
diff --git a/docker.spec b/docker.spec
index 11bc28b..827f988 100644
--- a/docker.spec
+++ b/docker.spec
@@ -39,7 +39,7 @@
 
 # docker
 %global git_docker https://github.com/projectatomic/docker
-%global commit_docker 584d391084d425cc99142f11d8fb738f0159ce11
+%global commit_docker b186df3d9438f1db11f026c5281722086bfe4a7f
 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
 # docker_branch used in %%check
 %global docker_branch docker-1.13.1
@@ -97,7 +97,7 @@ Name: %{repo}
 Epoch: 2
 %endif
 Version: 1.13.1
-Release: 44.git%{shortcommit_docker}%{?dist}
+Release: 45.git%{shortcommit_docker}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
@@ -1027,6 +1027,12 @@ exit 0
 %{_unitdir}/%{repo}-lvm-plugin.*
 
 %changelog
+* Sun Jan 28 2018 Dan Walsh <dwalsh@fedoraproject.org> - 2:1.13.1-45.b186df3
+-  Prevent panic when X-Registry-Auth: null
+-  BACKPORT: Do not reuse a http.Request after a failure in callWithRetry
+-  BACKPORT: devicemapper: remove container rootfs mountPath after umount
+-  BACKPORT: devmapper: Log fstype and mount options during mount error
+
 * Thu Nov 23 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-44.git584d391
 - built docker @projectatomic/docker-1.13.1 commit 584d391
 - built docker-novolume-plugin commit 385ec70
diff --git a/sources b/sources
index 6126d86..7f17e93 100644
--- a/sources
+++ b/sources
@@ -7,3 +7,4 @@ SHA512 (libnetwork-460ac8f.tar.gz) = b21b5218ebb0290ef999da7f9cac438ba438947a9c8
 SHA512 (rhel-push-plugin-af9107b.tar.gz) = e17c8970edff2eae4a2cc7f5a09a054171700032f2e6d15b043f3ebdb902385a95c4afed3cedd67e5d7bf4292a0b945f7c84f84f1162930fc8f365825110e573
 SHA512 (runc-1c91122.tar.gz) = 5459fab857a30d8fc8a2180d898a2d6b9fe99571144b5b9f69072d341ade533af9f3f8c84409c7b6349a1b15b1095480905f17aaa68ea67f382dc00d6f2704df
 SHA512 (tini-0effd37.tar.gz) = 23a3714393fb9b1f5162fc530ecf56cc6915b3c3a709b3b80d9dc0834e28e1821ed945388595a3b162757bf029e6936f75ab3b1c2b9ecb3ac65be14132b06869
+SHA512 (docker-b186df3.tar.gz) = eebce4d5c2f0c40bb8b1bc25205ddce920a5cb7b9a9cbc2c45b56731ae4149ce3c77171579b3fdcf00bfb42ff5bff2f8bb59dfdb7a58bf14adb0b96d705eef98