From 9c0a8218c749483587f260ebd3234e075c5ceaa2 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 25 2017 16:02:42 +0000
Subject: import docker-1.12.6-28.git1398f24.el7


---

diff --git a/.docker.metadata b/.docker.metadata
index 237c827..0298c4f 100644
--- a/.docker.metadata
+++ b/.docker.metadata
@@ -1,8 +1,8 @@
-9fdef98d24c09c571f74523c2b4c52f08e16f032 SOURCES/3a094bd354f91c08f76655da01921369b04714b5.tar.gz
-d735e338ba341bfe9bc47e35ae1940b5b24549d9 SOURCES/containerd-471f03c.tar.gz
+d9802a7be0f2740b9c31df6dd7d6c4297c00cdf6 SOURCES/1398f249013601ab999d286910664d70fd1329a2.tar.gz
+c0a182215572ddd308319cf4c4d2872014d199e4 SOURCES/containerd-f3f35e9.tar.gz
 ab20ee7e721a8c02467b482033a499006a8c6320 SOURCES/docker-lvm-plugin-8647404.tar.gz
 24382ff77b251c04672d652758cca2a33cc8c216 SOURCES/docker-novolume-plugin-385ec70.tar.gz
 a2a9f5deac1f258765a1840240f8d80c2767e99f SOURCES/docker-storage-setup-f7a3746.tar.gz
-b73afe2810c735395f2d4d56dc939dbff76c0ddf SOURCES/rhel-push-plugin-70653ed.tar.gz
-857a84a3876e729919fc46424709ce5dc774b6f0 SOURCES/runc-81b2542.tar.gz
+f97e24fe3b983854ce79547955173943c954ac23 SOURCES/rhel-push-plugin-af9107b.tar.gz
+4d570eeccdf6dc34b94a2f3245110311020fc750 SOURCES/runc-f572169.tar.gz
 ea4b3d96c46fccb6781d66a6c53c087b179c80fe SOURCES/v1.10-migrator-c417a6a.tar.gz
diff --git a/.gitignore b/.gitignore
index 107302b..cf71940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
-SOURCES/3a094bd354f91c08f76655da01921369b04714b5.tar.gz
-SOURCES/containerd-471f03c.tar.gz
+SOURCES/1398f249013601ab999d286910664d70fd1329a2.tar.gz
+SOURCES/containerd-f3f35e9.tar.gz
 SOURCES/docker-lvm-plugin-8647404.tar.gz
 SOURCES/docker-novolume-plugin-385ec70.tar.gz
 SOURCES/docker-storage-setup-f7a3746.tar.gz
-SOURCES/rhel-push-plugin-70653ed.tar.gz
-SOURCES/runc-81b2542.tar.gz
+SOURCES/rhel-push-plugin-af9107b.tar.gz
+SOURCES/runc-f572169.tar.gz
 SOURCES/v1.10-migrator-c417a6a.tar.gz
diff --git a/SOURCES/daemon.json b/SOURCES/daemon.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/SOURCES/daemon.json
@@ -0,0 +1 @@
+{}
diff --git a/SOURCES/docker-cleanup.service b/SOURCES/docker-cleanup.service
index 3f60331..a8d4728 100644
--- a/SOURCES/docker-cleanup.service
+++ b/SOURCES/docker-cleanup.service
@@ -1,11 +1,8 @@
 [Unit]
 Description=Docker Cleanup
-Requires=docker.service
+BindsTo=docker.service
 
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/sh -c "DEAD=`docker ps -aq -f status=dead` && [ -n \"$DEAD\" ] && docker rm $DEAD; exit 0"
-
-[Install]
-WantedBy=multi-user.target
diff --git a/SOURCES/docker-cleanup.timer b/SOURCES/docker-cleanup.timer
index b4948d4..c47a096 100644
--- a/SOURCES/docker-cleanup.timer
+++ b/SOURCES/docker-cleanup.timer
@@ -1,5 +1,7 @@
 [Unit]
 Description=Run docker-cleanup every hour
+BindsTo=docker.service
+After=docker.service
 
 [Timer]
 OnCalendar=hourly
diff --git a/SOURCES/docker.service b/SOURCES/docker.service
index af79ee3..295555f 100644
--- a/SOURCES/docker.service
+++ b/SOURCES/docker.service
@@ -3,11 +3,13 @@ Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
 After=network.target
 Wants=docker-storage-setup.service
+Requires=rhel-push-plugin.socket
 Requires=docker-cleanup.timer
 
 [Service]
 Type=notify
 NotifyAccess=all
+KillMode=process
 EnvironmentFile=-/etc/sysconfig/docker
 EnvironmentFile=-/etc/sysconfig/docker-storage
 EnvironmentFile=-/etc/sysconfig/docker-network
@@ -17,6 +19,7 @@ Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
 ExecStart=/usr/bin/dockerd-current \
           --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current \
           --default-runtime=docker-runc \
+          --authorization-plugin=rhel-push-plugin \
           --exec-opt native.cgroupdriver=systemd \
           --userland-proxy-path=/usr/libexec/docker/docker-proxy-current \
           $OPTIONS \
diff --git a/SOURCES/docker.sysconfig b/SOURCES/docker.sysconfig
index 1457889..de10538 100644
--- a/SOURCES/docker.sysconfig
+++ b/SOURCES/docker.sysconfig
@@ -10,7 +10,7 @@ fi
 # pull use the ADD_REGISTRY option to list a set of registries, each prepended
 # with --add-registry flag. The first registry added will be the first registry
 # searched.
-# ADD_REGISTRY='--add-registry registry.access.redhat.com'
+ADD_REGISTRY='--add-registry registry.access.redhat.com'
 
 # If you want to block registries from being used, uncomment the BLOCK_REGISTRY
 # option and give it a set of registries, each prepended with --block-registry
diff --git a/SPECS/docker.spec b/SPECS/docker.spec
index a16d400..4308264 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 3a094bd354f91c08f76655da01921369b04714b5
+%global commit_docker 1398f249013601ab999d286910664d70fd1329a2
 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
 # docker_branch used in %%check
 %global docker_branch %{name}-%{version}
@@ -46,9 +46,9 @@
 %global shortcommit_novolume %(c=%{commit_novolume}; echo ${c:0:7})
 
 # rhel-push-plugin
-#%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin
-#%global commit_rhel_push 70653ed7cbef7623ab850d09f0257a6b670582ce
-#%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7})
+%global git_rhel_push https://github.com/projectatomic/rhel-push-plugin
+%global commit_rhel_push af9107b2aedb235338e32a3c19507cad3f218b0d
+%global shortcommit_rhel_push %(c=%{commit_rhel_push}; echo ${c:0:7})
 
 # docker-lvm-plugin
 %global git_lvm https://github.com/projectatomic/%{repo}-lvm-plugin
@@ -57,25 +57,25 @@
 
 # docker-runc
 %global git_runc https://github.com/projectatomic/runc
-%global commit_runc 81b254244390bc636b20c87c34a3d9e1a8645069
+%global commit_runc f5721697226d42d9efeea37fa3a7eb1d208fa1a2
 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7})
 
 # docker-containerd
 %global git_containerd https://github.com/projectatomic/containerd
-%global commit_containerd 471f03c11413d9ab1523de24d3e79ae3a7b8126e
+%global commit_containerd f3f35e914f4f403f8073a2958b9ab6ed99eb7f2a
 %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7})
 
 Name: %{repo}
 Epoch: 2
 Version: 1.12.6
-Release: 16%{?dist}
+Release: 28.git%{shortcommit_docker}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{import_path}
 Source0: %{git_docker}/archive/%{commit_docker}.tar.gz
 Source2: %{git_dss}/archive/%{commit_dss}/%{repo}-storage-setup-%{shortcommit_dss}.tar.gz
 Source4: %{git_novolume}/archive/%{commit_novolume}/%{repo}-novolume-plugin-%{shortcommit_novolume}.tar.gz
-#Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz
+Source5: %{git_rhel_push}/archive/%{commit_rhel_push}/rhel-push-plugin-%{shortcommit_rhel_push}.tar.gz
 Source6: %{git_lvm}/archive/%{commit_lvm}/%{repo}-lvm-plugin-%{shortcommit_lvm}.tar.gz
 Source8: %{name}.service
 Source9: %{name}.sysconfig
@@ -94,6 +94,8 @@ Source22: %{name}-containerd-shim-common.sh
 Source24: %{name}d-common.sh
 Source25: %{name}-cleanup.service
 Source26: %{name}-cleanup.timer
+Source27: daemon.json
+BuildRequires: sed
 BuildRequires: git
 BuildRequires: glibc-static
 BuildRequires: golang >= 1.7.4
@@ -113,14 +115,14 @@ Requires(preun): systemd
 Requires(postun): systemd
 Requires: xz
 Requires: device-mapper-libs >= 7:1.02.97
-#Requires: subscription-manager
-#Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
+Requires: subscription-manager
+Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
 Requires: oci-register-machine >= 1:0-3.10
 Requires: oci-systemd-hook >= 1:0.1.4-9
 Provides: lxc-%{name} = %{epoch}:%{version}-%{release}
 Provides: %{name}-io = %{epoch}:%{version}-%{release}
 
-Requires: container-selinux >= 2:2.10-2
+Requires: container-selinux >= 2:2.12-2
 
 # rhbz#1214070 - update deps for d-s-s
 Requires: lvm2 >= 2.02.112
@@ -215,16 +217,16 @@ local volumes defined. In particular, the plugin will block `docker run` with:
 
 The only thing allowed will be just bind mounts.
 
-#%package rhel-push-plugin
-#License: GPLv2
-#Summary: Avoids pushing a RHEL-based image to docker.io registry
+%package rhel-push-plugin
+License: GPLv2
+Summary: Avoids pushing a RHEL-based image to docker.io registry
 
-#%description rhel-push-plugin
-#In order to use this plugin you must be running at least Docker 1.10 which
-#has support for authorization plugins.
+%description rhel-push-plugin
+In order to use this plugin you must be running at least Docker 1.10 which
+has support for authorization plugins.
 
-#This plugin avoids any RHEL based image to be pushed to the default docker.io
-#registry preventing users to violate the RH subscription agreement.
+This plugin avoids any RHEL based image to be pushed to the default docker.io
+registry preventing users to violate the RH subscription agreement.
 
 %package lvm-plugin
 License: LGPLv3
@@ -247,7 +249,7 @@ tar zxf %{SOURCE2}
 tar zxf %{SOURCE4}
 
 # untar rhel-push-plugin
-#tar zxf %{SOURCE5}
+tar zxf %{SOURCE5}
 
 # untar lvm-plugin
 tar zxf %{SOURCE6}
@@ -286,11 +288,15 @@ tar zxf %{SOURCE20}
 %build
 mkdir _build
 
+%global version_tag %{name}-%{version}-%{release}.%{_arch}
+%{__sed} -r -i 's/^([\t ]*PkgVersion:[\t ]*)"<unknown>",$/\1"%{version_tag}",/' daemon/info.go
+%{__sed} -r -i 's/^([\t ]*PkgVersion:[\t ]*)"<unknown>",$/\1"%{version_tag}",/' api/client/system/version.go
+
 pushd _build
   mkdir -p src/%{provider}.%{provider_tld}/{%{name},projectatomic}
   ln -s $(dirs +1 -l) src/%{import_path}
   ln -s $(dirs +1 -l)/%{repo}-novolume-plugin-%{commit_novolume} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
-#  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
+  ln -s $(dirs +1 -l)/rhel-push-plugin-%{commit_rhel_push} src/%{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
   ln -s $(dirs +1 -l)/%{repo}-lvm-plugin-%{commit_lvm} src/%{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin
 popd
 
@@ -299,10 +305,10 @@ pushd $(pwd)/_build/src
 %gobuild %{provider}.%{provider_tld}/projectatomic/%{repo}-novolume-plugin
 popd
 
-#export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build
-#pushd $(pwd)/_build/src
-#%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
-#popd
+export GOPATH=$(pwd)/rhel-push-plugin-%{commit_rhel_push}/Godeps/_workspace:$(pwd)/_build
+pushd $(pwd)/_build/src
+%gobuild %{provider}.%{provider_tld}/projectatomic/rhel-push-plugin
+popd
 
 export GOPATH=$(pwd)/%{repo}-lvm-plugin-%{commit_lvm}/vendor:$(pwd)/_build
 pushd $(pwd)/_build/src
@@ -316,7 +322,7 @@ export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
 # build %%{name} manpages
 man/md2man-all.sh
 go-md2man -in %{repo}-novolume-plugin-%{commit_novolume}/man/%{repo}-novolume-plugin.8.md -out %{repo}-novolume-plugin.8
-#go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
+go-md2man -in rhel-push-plugin-%{commit_rhel_push}/man/rhel-push-plugin.8.md -out rhel-push-plugin.8
 go-md2man -in %{repo}-lvm-plugin-%{commit_lvm}/man/%{repo}-lvm-plugin.8.md -out %{repo}-lvm-plugin.8
 
 # build %%{name} binary
@@ -368,6 +374,10 @@ for x in bundles/latest; do
     break
 done
 
+# install daemon.json
+install -dp %{buildroot}%{_sysconfdir}/%{name}
+install -p -m 644 %{SOURCE27} %{buildroot}%{_sysconfdir}/%{name}
+
 # install manpages
 install -d %{buildroot}%{_mandir}/man1
 install -p -m 644 man/man1/* %{buildroot}%{_mandir}/man1
@@ -430,13 +440,13 @@ rm -rf %{buildroot}%{_sharedstatedir}/%{name}-unit-test/contrib/init/openrc/%{na
 %endif
 
 # install secrets dir
-#install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets
+install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets
 # rhbz#1110876 - update symlinks for subscription management
-#ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
-#ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
-#ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo
+ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
+ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
+ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo
 
-mkdir -p %{buildroot}/etc/%{name}/certs.d/redhat.{com,io}
+mkdir -p %{buildroot}/%{_sysconfdir}/%{name}/certs.d/redhat.{com,io}
 ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/%{name}/certs.d/redhat.com/redhat-ca.crt
 ln -s %{_sysconfdir}/rhsm/ca/redhat-uep.pem %{buildroot}/%{_sysconfdir}/%{name}/certs.d/redhat.io/redhat-ca.crt
 
@@ -460,12 +470,12 @@ install -d %{buildroot}%{_mandir}/man8
 install -p -m 644 %{repo}-novolume-plugin.8 %{buildroot}%{_mandir}/man8
 
 # install rhel-push-plugin executable, unitfile, socket and man
-#install -d %{buildroot}%{_libexecdir}/%{repo}
-#install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin
-#install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
-#install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket
-#install -d %{buildroot}%{_mandir}/man8
-#install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8
+install -d %{buildroot}%{_libexecdir}/%{repo}
+install -p -m 755 _build/src/rhel-push-plugin %{buildroot}%{_libexecdir}/%{repo}/rhel-push-plugin
+install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.service %{buildroot}%{_unitdir}/rhel-push-plugin.service
+install -p -m 644 rhel-push-plugin-%{commit_rhel_push}/systemd/rhel-push-plugin.socket %{buildroot}%{_unitdir}/rhel-push-plugin.socket
+install -d %{buildroot}%{_mandir}/man8
+install -p -m 644 rhel-push-plugin.8 %{buildroot}%{_mandir}/man8
 
 # install %%{repo}-lvm-plugin executable, unitfile, socket and man
 install -d %{buildroot}/%{_libexecdir}/%{repo}
@@ -505,6 +515,10 @@ install -p -m 755 containerd-%{commit_containerd}/bin/ctr %{buildroot}%{_bindir}
 
 %pre
 getent passwd %{name}root > /dev/null || %{_sbindir}/useradd -r -d %{_sharedstatedir}/%{name} -s /sbin/nologin -c "Docker User" %{name}root
+if [ !$(systemctl --quiet is-active %{name}.service) ]; then
+    echo "Stopping containers..."
+    %{_bindir}/%{name} stop $(%{_bindir}/%{name} ps -a -q)
+fi
 exit 0
 
 %post
@@ -534,14 +548,14 @@ exit 0
 %postun novolume-plugin
 %systemd_postun_with_restart %{name}-novolume-plugin.service
 
-#%post rhel-push-plugin
-#%systemd_post rhel-push-plugin.service
+%post rhel-push-plugin
+%systemd_post rhel-push-plugin.service
 
-#%preun rhel-push-plugin
-#%systemd_preun rhel-push-plugin.service
+%preun rhel-push-plugin
+%systemd_preun rhel-push-plugin.service
 
-#%postun rhel-push-plugin
-#%systemd_postun_with_restart rhel-push-plugin.service
+%postun rhel-push-plugin
+%systemd_postun_with_restart rhel-push-plugin.service
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -550,6 +564,7 @@ exit 0
 %license LICENSE*
 %doc AUTHORS CHANGELOG.md CONTRIBUTING.md MAINTAINERS NOTICE README*.md
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-*
+%config(noreplace) %{_sysconfdir}/%{name}/daemon.json
 %dir %{_sysconfdir}/%{name}
 %{_bindir}/%{name}d-current
 %{_bindir}/%{name}-storage-setup
@@ -560,8 +575,8 @@ exit 0
 %{_mandir}/man1/%{name}*.1.gz
 %{_mandir}/man5/*.5.gz
 %{_mandir}/man8/%{name}d.8.gz
-#%dir %{_datadir}/rhel
-#%{_datadir}/rhel/*
+%dir %{_datadir}/rhel
+%{_datadir}/rhel/*
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}-storage-setup.service
 %{_datadir}/bash-completion/completions/%{name}
@@ -616,12 +631,12 @@ exit 0
 %{_libexecdir}/%{repo}/%{repo}-novolume-plugin
 %{_unitdir}/%{repo}-novolume-plugin.*
 
-#%files rhel-push-plugin
-#%license rhel-push-plugin-%{commit_rhel_push}/LICENSE
-#%doc rhel-push-plugin-%{commit_rhel_push}/README.md
-#%{_mandir}/man8/rhel-push-plugin.8.gz
-#%{_libexecdir}/%{repo}/rhel-push-plugin
-#%{_unitdir}/rhel-push-plugin.*
+%files rhel-push-plugin
+%license rhel-push-plugin-%{commit_rhel_push}/LICENSE
+%doc rhel-push-plugin-%{commit_rhel_push}/README.md
+%{_mandir}/man8/rhel-push-plugin.8.gz
+%{_libexecdir}/%{repo}/rhel-push-plugin
+%{_unitdir}/rhel-push-plugin.*
 
 %files lvm-plugin
 %license %{repo}-lvm-plugin-%{commit_lvm}/LICENSE
@@ -637,8 +652,77 @@ exit 0
 %{_bindir}/%{name}-v1.10-migrator-*
 
 %changelog
-* Fri Apr 14 2017 Johnny Hughes <johnny@centos.org> - 2:1.12.6-16
-- Manual CentOS Debranding
+* Wed May 17 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-28.git1398f24
+- Resolves: #1417242, #1451079
+- built docker @projectatomic/docker-1.12.6 commit 1398f24
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit af9107b
+- built docker-lvm-plugin commit 8647404
+- built docker-runc @projectatomic/docker-1.12.6 commit f572169
+- built docker-containerd @projectatomic/docker-1.12.6 commit f3f35e9
+
+* Mon May 15 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-27.gitb8651c8
+- Resolves: #1427212
+- built docker @projectatomic/docker-1.12.6-hotfixes commit b8651c8
+- built docker-runc @projectatomic/docker-1.12.6 commit 81b2542
+- built docker-containerd @projectatomic/docker-1.12.6 commit f3f35e9
+
+* Thu May 11 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-26.git62520c0
+- Resolves: #1450172 - exec 'docker stop' only if docker daemon is running on
+package upgrade
+
+* Thu May 11 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-25.git62520c0
+- Resolves: #1447536 - ship empty but valid /etc/docker/daemon.json
+
+* Tue May 09 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-24.git62520c0
+- Resolves: #1447536 - ship empty /etc/docker/daemon.json
+
+* Tue May 09 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-23.git62520c0
+- Resolves: #1424709 - add KillMode=process to docker unitfile
+
+* Tue May 09 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-22.git62520c0
+- correct docker-cleanup.timer file
+- correct previous date in changelog
+
+* Tue May 09 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-21.git62520c0
+- Resolves: #1448457
+- requires container-selinux >= 2.12-2
+
+* Fri May 05 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-20.git62520c0
+- Resolves: #1427212
+- built docker @projectatomic/docker-1.12.6 commit 62520c0
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit 70653ed
+- built docker-lvm-plugin commit 8647404
+- built docker-runc @projectatomic/docker-1.12.6 commit 7f4b00e
+- built docker-containerd @projectatomic/docker-1.12.6 commit f3f35e9
+
+* Mon May 01 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-19.git92b10e4
+- Resolves: #1437784
+- built docker @projectatomic/docker-1.12.6 commit 92b10e4
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit 70653ed
+- built docker-lvm-plugin commit 8647404
+- built docker-runc @projectatomic/docker-1.12.6 commit 7f4b00e
+- built docker-containerd @projectatomic/docker-1.12.6 commit f3f35e9
+
+* Mon Apr 24 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-18.git29d6f69
+- Resolves: #1409076
+- built docker @projectatomic/docker-1.12.6 commit 29d6f69
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit 70653ed
+- built docker-lvm-plugin commit 8647404
+- built docker-runc @projectatomic/docker-1.12.6 commit 81b2542
+- built docker-containerd @projectatomic/docker-1.12.6 commit f3f35e9
+
+* Fri Apr 21 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-17.gitca42c82
+- Resolves: #1427156
+- built docker @projectatomic/docker-1.12.6 commit ca42c82
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit 70653ed
+- built docker-lvm-plugin commit 8647404
+- built docker-runc @projectatomic/docker-1.12.6 commit 81b2542
+- built docker-containerd @projectatomic/docker-1.12.6 commit f3f35e9
 
 * Tue Mar 21 2017 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.12.6-16
 - require oci-register-machine >= 1:0-3.10