From c2779fa22ee3dff72afdb202395c8c623fbaad61 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 26 2018 18:41:17 +0000
Subject: import docker-1.13.1-68.gitdded712.el7


---

diff --git a/.docker.metadata b/.docker.metadata
index b00f0b3..452d6e0 100644
--- a/.docker.metadata
+++ b/.docker.metadata
@@ -1,10 +1,10 @@
-5f2ee34452a1cdf1a47cbb288779db277384360f SOURCES/94f42401bf8b413eac9dbb0e4065fa5bcb640696.tar.gz
 9e9e55d86e9df69ce17c8186d6ead913273f02cf SOURCES/container-storage-setup-e0997c3.tar.gz
 402d105d5ed40a9820d41b3f677df07c566393c9 SOURCES/containerd-296f1f8.tar.gz
-59ad98a21ceca5617c1b8f8fdd6feb421ab16367 SOURCES/docker-lvm-plugin-04caa55.tar.gz
+551b9f749d6fd3c466dec12b34ac17e484c45a73 SOURCES/dded7126c42fb99f901b9e998b014452ef8daa82.tar.gz
+97aa4658bff77a6b8a1635ec68b09818e3d7733b SOURCES/docker-lvm-plugin-6675634.tar.gz
 0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz
-b2e15cf176c0f24816d49903c19a9561c869aa12 SOURCES/libnetwork-5c1218c.tar.gz
+1a3bb20b481ba9b9d7ad07a2af8a12df3fdb47d0 SOURCES/libnetwork-19279f0.tar.gz
 965d64f5a81c3a428ca3b29495ecf66748c67c1f SOURCES/rhel-push-plugin-af9107b.tar.gz
-78795d104677625593c70e1dbe569f235b5af0c5 SOURCES/runc-e9c345b.tar.gz
-c5c3577b90edc8902f3dd888e55334ba6e9e1ddf SOURCES/tini-5b117de.tar.gz
+b76eb87af71b8264700a2bda5064a133e54b82e1 SOURCES/runc-5eda6f6.tar.gz
+7941233b1ed34afdc074e74ab26a86dea20ee7d4 SOURCES/tini-fec3683.tar.gz
 496f9927f4254508ea1cd94f473b5b9321d41245 SOURCES/v1.10-migrator-c417a6a.tar.gz
diff --git a/.gitignore b/.gitignore
index 84c6e95..6e7b60a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
-SOURCES/94f42401bf8b413eac9dbb0e4065fa5bcb640696.tar.gz
 SOURCES/container-storage-setup-e0997c3.tar.gz
 SOURCES/containerd-296f1f8.tar.gz
-SOURCES/docker-lvm-plugin-04caa55.tar.gz
+SOURCES/dded7126c42fb99f901b9e998b014452ef8daa82.tar.gz
+SOURCES/docker-lvm-plugin-6675634.tar.gz
 SOURCES/docker-novolume-plugin-385ec70.tar.gz
-SOURCES/libnetwork-5c1218c.tar.gz
+SOURCES/libnetwork-19279f0.tar.gz
 SOURCES/rhel-push-plugin-af9107b.tar.gz
-SOURCES/runc-e9c345b.tar.gz
-SOURCES/tini-5b117de.tar.gz
+SOURCES/runc-5eda6f6.tar.gz
+SOURCES/tini-fec3683.tar.gz
 SOURCES/v1.10-migrator-c417a6a.tar.gz
diff --git a/SOURCES/docker.service b/SOURCES/docker.service
index 989763e..572b5f6 100644
--- a/SOURCES/docker.service
+++ b/SOURCES/docker.service
@@ -3,6 +3,7 @@ Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
 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
 
 [Service]
@@ -18,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 \
           --init-path=/usr/libexec/docker/docker-init-current \
diff --git a/SOURCES/docker.sysconfig b/SOURCES/docker.sysconfig
index ba5b70b..b08f26b 100644
--- a/SOURCES/docker.sysconfig
+++ b/SOURCES/docker.sysconfig
@@ -10,10 +10,6 @@ fi
 # from the atomic-registries package.
 #
 
-# On an SELinux system, if you remove the --selinux-enabled option, you
-# also need to turn on the docker_transition_unconfined boolean.
-# setsebool -P docker_transition_unconfined 1
-
 # Location used for temporary files, such as those created by
 # docker load and build operations. Default is /var/lib/docker/tmp
 # Can be overriden by setting the following environment variable.
diff --git a/SPECS/docker.spec b/SPECS/docker.spec
index fcb4c72..686af44 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 94f42401bf8b413eac9dbb0e4065fa5bcb640696
+%global commit_docker dded7126c42fb99f901b9e998b014452ef8daa82
 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
 # docker_branch used in %%check
 %global docker_branch %{name}-%{version}
@@ -46,18 +46,18 @@
 %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 af9107b2aedb235338e32a3c19507cad3f218b0d
-#%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
-%global commit_lvm 04caa55d50d614d11d542b187d8faa33f13b116e
+%global commit_lvm 66756347828c00ea1cae119e3ba5ece29f8c4582
 %global shortcommit_lvm %(c=%{commit_lvm}; echo ${c:0:7})
 
 # docker-runc
 %global git_runc https://github.com/projectatomic/runc
-%global commit_runc e9c345b3f906d5dc5e8100b05ce37073a811c74a
+%global commit_runc 5eda6f6fd0c2884c2c8e78a6e7119e8d0ecedb77
 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7})
 
 # docker-containerd
@@ -67,25 +67,25 @@
 
 # docker-init
 %global git_tini https://github.com/krallin/tini
-%global commit_tini 5b117de7f824f3d3825737cf09581645abbe35d4
+%global commit_tini fec3683b971d9c3ef73f284f176672c44b448662
 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7})
 
 # docker-proxy
 %global git_libnetwork https://github.com/docker/libnetwork
-%global commit_libnetwork 5c1218c956c99f3365711974e300087810c31379
+%global commit_libnetwork 19279f0492417475b6bfbd0aa529f73e8f178fb5
 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7})
 
 Name: %{repo}
 Epoch: 2
 Version: 1.13.1
-Release: 63.git%{shortcommit_docker}%{?dist}
+Release: 68.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}/container-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
@@ -179,9 +179,9 @@ Requires: device-mapper-libs >= 7:1.02.97
 Requires: oci-umount >= 2:2.3.3-3
 Requires: oci-register-machine >= 1:0-5.13
 Requires: oci-systemd-hook >= 1:0.1.4-9
-#Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
+Requires: %{name}-rhel-push-plugin = %{epoch}:%{version}-%{release}
 Requires: xz
-#Requires: atomic-registries
+Requires: atomic-registries
 Requires: container-selinux >= 2:2.51-1
 Requires: container-storage-setup >= 0.9.0-1
 # rhbz#1214070 - update deps for d-s-s
@@ -231,16 +231,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
@@ -263,14 +263,11 @@ tar zxf %{SOURCE2}
 tar zxf %{SOURCE4}
 
 # untar rhel-push-plugin
-#tar zxf %{SOURCE5}
+tar zxf %{SOURCE5}
 
 # untar lvm-plugin
 tar zxf %{SOURCE6}
-pushd %{repo}-lvm-plugin-%{commit_lvm}/vendor
-mkdir src
-mv g* src/
-popd
+sed -i 's/sirupsen/Sirupsen/g' %{name}-lvm-plugin-%{commit_lvm}/Godeps/_workspace/src/%{import_path}/pkg/mount/mount.go
 
 # systemd file
 cp %{SOURCE8} .
@@ -324,7 +321,7 @@ 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
 
@@ -333,12 +330,12 @@ 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
+export GOPATH=$(pwd)/%{repo}-lvm-plugin-%{commit_lvm}/Godeps/_workspace:$(pwd)/_build
 pushd $(pwd)/_build/src
 %gobuild %{provider}.%{provider_tld}/projectatomic/%{repo}-lvm-plugin
 popd
@@ -350,7 +347,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
@@ -507,12 +504,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}
@@ -592,14 +589,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
 
 %posttrans
 # Install a default docker-storage-setup based on kernel version.
@@ -695,12 +692,12 @@ fi
 %{_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
@@ -716,8 +713,49 @@ fi
 %{_bindir}/%{name}-v1.10-migrator-*
 
 %changelog
-* Fri May 18 2018 Johnny Hughes <johnny@centos.org> - 2:1.13.1-63.git94f4240
-- Manual CentOS Debranding
+* Tue Jun 12 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-68.gitdded712
+- built docker @projectatomic/docker-1.13.1-rhel commit dded712
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit af9107b
+- built docker-lvm-plugin commit 6675634
+- built docker-runc @projectatomic/docker-1.13.1-rhel commit 5eda6f6
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8
+- built docker-init commit fec3683
+- built libnetwork commit 19279f0
+
+* Tue Jun 12 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-67.gitdded712
+- built docker @projectatomic/docker-1.13.1-rhel commit dded712
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit af9107b
+- built docker-lvm-plugin commit 6675634
+- built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8
+- built docker-init commit fec3683
+- built libnetwork commit 19279f0
+
+* Mon Jun 11 2018 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.13.1-66.gitdded712
+- Resolves: #1588773
+- built docker @projectatomic/docker-1.13.1-rhel commit dded712
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit af9107b
+- built docker-lvm-plugin commit 6675634
+- built docker-runc @projectatomic/docker-1.13.1-rhel commit a9d1096
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8
+- built docker-init commit fec3683
+- built libnetwork commit 19279f0
+
+* Wed Jun 06 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-65.git6c336e4
+- remove outdated comment about docker_transition_unconfined
+
+* Mon Jun 04 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-64.git6c336e4
+- built docker @projectatomic/docker-1.13.1-rhel commit 6c336e4
+- built docker-novolume-plugin commit 385ec70
+- built rhel-push-plugin commit af9107b
+- built docker-lvm-plugin commit 04caa55
+- built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8
+- built docker-init commit 5b117de
+- built libnetwork commit 5c1218c
 
 * Mon Apr 30 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-63.git94f4240
 - built docker @projectatomic/docker-1.13.1-rhel commit 94f4240