From 992eddd40050b6ed233cb459c5db6e2d097819f3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 28 2018 09:17:17 +0000
Subject: import docker-1.13.1-84.git07f3374.el7


---

diff --git a/.docker.metadata b/.docker.metadata
index 8a146cd..1d50c84 100644
--- a/.docker.metadata
+++ b/.docker.metadata
@@ -1,9 +1,9 @@
-eb3534bc206419fd8a55c53ff1e64dfebf124f3a SOURCES/8633870faeff2c03dd6a75fdef9c2976379339c6.tar.gz
-9e9e55d86e9df69ce17c8186d6ead913273f02cf SOURCES/container-storage-setup-e0997c3.tar.gz
-3d4e57f6236139b11acce831d5a8b8dc9555ec46 SOURCES/containerd-c769d58.tar.gz
+4191963addb1f68b3bebfb93dbe12cb5db7a22d1 SOURCES/07f3374cf1b29aadf824d8b8dcbf6e63403689c6.tar.gz
+e21d6c1b9e04650915499946bb4e6a01727c7d54 SOURCES/container-storage-setup-413b408.tar.gz
+acac6c27b31a691a1326033861c18dbdd4588a07 SOURCES/containerd-923a387.tar.gz
 c5e6169ea101c97d94257f48fa227f5ff0501454 SOURCES/docker-lvm-plugin-20a1f68.tar.gz
 0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz
-62ad0155c8906bf04f5088bd0ceb91ff1615a9d7 SOURCES/libnetwork-a5a6ca3.tar.gz
+656b1d1605dc43d7f5c00cedadd686dbd418d285 SOURCES/libnetwork-c5d66a0.tar.gz
 965d64f5a81c3a428ca3b29495ecf66748c67c1f SOURCES/rhel-push-plugin-af9107b.tar.gz
 b76eb87af71b8264700a2bda5064a133e54b82e1 SOURCES/runc-5eda6f6.tar.gz
 7941233b1ed34afdc074e74ab26a86dea20ee7d4 SOURCES/tini-fec3683.tar.gz
diff --git a/.gitignore b/.gitignore
index 1a60ac6..69d6960 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
-SOURCES/8633870faeff2c03dd6a75fdef9c2976379339c6.tar.gz
-SOURCES/container-storage-setup-e0997c3.tar.gz
-SOURCES/containerd-c769d58.tar.gz
+SOURCES/07f3374cf1b29aadf824d8b8dcbf6e63403689c6.tar.gz
+SOURCES/container-storage-setup-413b408.tar.gz
+SOURCES/containerd-923a387.tar.gz
 SOURCES/docker-lvm-plugin-20a1f68.tar.gz
 SOURCES/docker-novolume-plugin-385ec70.tar.gz
-SOURCES/libnetwork-a5a6ca3.tar.gz
+SOURCES/libnetwork-c5d66a0.tar.gz
 SOURCES/rhel-push-plugin-af9107b.tar.gz
 SOURCES/runc-5eda6f6.tar.gz
 SOURCES/tini-fec3683.tar.gz
diff --git a/SOURCES/docker.service b/SOURCES/docker.service
index 450b425..535487c 100644
--- a/SOURCES/docker.service
+++ b/SOURCES/docker.service
@@ -1,8 +1,9 @@
 [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
 
 [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/SPECS/docker.spec b/SPECS/docker.spec
index 95acaec..98c23fb 100644
--- a/SPECS/docker.spec
+++ b/SPECS/docker.spec
@@ -25,14 +25,14 @@
 
 # docker
 %global git_docker https://github.com/projectatomic/docker
-%global commit_docker 8633870faeff2c03dd6a75fdef9c2976379339c6
+%global commit_docker 07f3374cf1b29aadf824d8b8dcbf6e63403689c6
 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
 # docker_branch used in %%check
 %global docker_branch %{name}-%{version}
 
 # d-s-s
 %global git_dss https://github.com/projectatomic/container-storage-setup
-%global commit_dss e0997c32103235a3eff8fe6917e6f2d0507c119e
+%global commit_dss 413b4080c0b9346a242d88137bb3e9e0a6aa25f9
 %global shortcommit_dss %(c=%{commit_dss}; echo ${c:0:7})
 %global dss_libdir %{_exec_prefix}/lib/%{name}-storage-setup
 
@@ -47,9 +47,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 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
@@ -63,7 +63,7 @@
 
 # docker-containerd
 %global git_containerd https://github.com/projectatomic/containerd
-%global commit_containerd c769d58ebfebb896859d1efd016bb455bd4134f3
+%global commit_containerd 923a38785ecb7156f00403cb1cbf5b448bd3befa
 %global shortcommit_containerd %(c=%{commit_containerd}; echo ${c:0:7})
 
 # docker-init
@@ -73,20 +73,21 @@
 
 # docker-proxy
 %global git_libnetwork https://github.com/docker/libnetwork
-%global commit_libnetwork a5a6ca30d6909649b2bcc21b6932cb93ccda9f7c
+%global commit_libnetwork c5d66a04ae80cd8fa2465ea99c0b2b1a6840cb93
 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7})
 
 Name: %{repo}
 Epoch: 2
 Version: 1.13.1
-Release: 75.git%{shortcommit_docker}%{?dist}
+Release: 84.git%{shortcommit_docker}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{import_path}
+ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
 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
@@ -114,7 +115,9 @@ BuildRequires: cmake
 BuildRequires: sed
 BuildRequires: git
 BuildRequires: glibc-static
-BuildRequires: golang >= 1.7.4
+BuildRequires: go-toolset-7-golang-bin
+BuildRequires: go-toolset-7-runtime
+BuildRequires: openssl-devel
 BuildRequires: gpgme-devel
 BuildRequires: device-mapper-devel
 BuildRequires: pkgconfig(audit)
@@ -183,7 +186,7 @@ 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: container-selinux >= 2:2.51-1
@@ -235,16 +238,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
@@ -257,6 +260,8 @@ Docker Volume Driver for lvm volumes.
 This plugin can be used to create lvm volumes of specified size, which can
 then be bind mounted into the container using `docker run` command.
 
+%enable_gotoolset7
+
 %prep
 %setup -q -n %{name}-%{commit_docker}
 
@@ -267,7 +272,7 @@ tar zxf %{SOURCE2}
 tar zxf %{SOURCE4}
 
 # untar rhel-push-plugin
-#tar zxf %{SOURCE5}
+tar zxf %{SOURCE5}
 
 # untar lvm-plugin
 tar zxf %{SOURCE6}
@@ -325,7 +330,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
 
@@ -334,10 +339,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}/Godeps/_workspace:$(pwd)/_build
 pushd $(pwd)/_build/src
@@ -346,12 +351,12 @@ popd
 
 export DOCKER_GITCOMMIT="%{shortcommit_docker}/%{version}"
 export DOCKER_BUILDTAGS='selinux seccomp'
-export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
+export GOPATH=$(pwd)/_build:$(pwd)/vendor
 
 # 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 +373,7 @@ popd
 
 # build %%{repo}-runc
 pushd runc-%{commit_runc}
+#export GOPATH=$GOPATH:$(pwd)/vendor
 make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc}
 popd
 
@@ -508,12 +514,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}
@@ -593,14 +599,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.
@@ -696,12 +702,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
@@ -717,8 +723,43 @@ fi
 %{_bindir}/%{name}-v1.10-migrator-*
 
 %changelog
-* Fri Sep 28 2018 Johnny Hughes <johnny@centos.org> - 2:1.13.1-75.git8633870
-- Manual CentOS Debranding
+* Tue Nov 06 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-84.git07f3374
+- built docker-containerd commit 923a387
+
+* Tue Nov 06 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-83.git07f3374
+- built docker @projectatomic/docker-1.13.1-rhel commit 07f3374
+- built container-storage-setup commit 413b408
+- built docker-lvm-plugin commit 20a1f68
+- built docker-containerd commit 296f1f8
+- built docker-init commit fec3683
+- built libnetwork commit c5d66a0
+- built docker-runc @projectatomic/docker-1.13.1-rhel commit 5eda6f6
+
+* Sun Oct 21 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-82.git9e82212
+- Resolves: #1628262
+- built docker @projectatomic/docker-1.13.1-rhel commit 9e82212
+
+* Thu Oct 11 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-81.git8865aaa
+- Resolves: #1636244
+- built docker @projectatomic/docker-1.13.1-rhel commit 8865aaa
+
+* Tue Oct 09 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-80.git8633870
+- Resolves: #1629733
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 2d876b8
+
+* Tue Oct 09 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-79.git8633870
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 2d876b8
+
+* Mon Oct 08 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-78.git8633870
+- Resolves: #1592413
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 72e088c
+
+* Mon Oct 08 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-77.git8633870
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 5382663
+
+* Fri Oct 05 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-76.git8633870
+- Resolves: #1629733
+- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 13b17fe
 
 * Wed Sep 12 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-75.git8633870
 - Resolves: #1625457, #1625022