From 6a04cfdf971dc812947d1fcc51be35237d674854 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 21 2017 20:06:48 +0000 Subject: import docker-latest-1.13.1-23.git28ae36d.el7 --- diff --git a/.docker-latest.metadata b/.docker-latest.metadata index fa79190..474df97 100644 --- a/.docker-latest.metadata +++ b/.docker-latest.metadata @@ -1,7 +1,7 @@ a2a9f5deac1f258765a1840240f8d80c2767e99f SOURCES/container-storage-setup-f7a3746.tar.gz 0b0730569b88b527d2265e79def8cb35e042cba3 SOURCES/containerd-89a5d2c.tar.gz -17751cdfee98845e620ee8fe58f9b13a504684e7 SOURCES/docker-cd75c68.tar.gz -638b3f8555f4d2ff9783bbf8c79e059cf549b7dc SOURCES/libnetwork-f81e09a.tar.gz -79e69c135d2110f017a5893abbd55911a6dee1bd SOURCES/runc-79db05f.tar.gz +3c34cc02ebd097aa11e731b6b879b8073fa83326 SOURCES/docker-28ae36d.tar.gz +de236ecfac2b933993837a6439cf0d7624f248c5 SOURCES/libnetwork-da27c78.tar.gz +fac7c7a94e7e02b25bebf60756f5f990cbc85a84 SOURCES/runc-b59a6bb.tar.gz 4cb9381a908a8e510e8568f471d08535f6a980a3 SOURCES/tini-4892d4d.tar.gz ea4b3d96c46fccb6781d66a6c53c087b179c80fe SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/.gitignore b/.gitignore index 12d8276..0fcab01 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/container-storage-setup-f7a3746.tar.gz SOURCES/containerd-89a5d2c.tar.gz -SOURCES/docker-cd75c68.tar.gz -SOURCES/libnetwork-f81e09a.tar.gz -SOURCES/runc-79db05f.tar.gz +SOURCES/docker-28ae36d.tar.gz +SOURCES/libnetwork-da27c78.tar.gz +SOURCES/runc-b59a6bb.tar.gz SOURCES/tini-4892d4d.tar.gz SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/SOURCES/0001-adjust-pkg-errors-imports.patch b/SOURCES/0001-adjust-pkg-errors-imports.patch deleted file mode 100644 index 27e8bc4..0000000 --- a/SOURCES/0001-adjust-pkg-errors-imports.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0fdc77886ccc101a28b11ce63e87a935c936d2ef Mon Sep 17 00:00:00 2001 -From: Antonio Murdaca -Date: Wed, 19 Jul 2017 20:02:32 +0200 -Subject: [PATCH] adjust pkg/errors imports - -Signed-off-by: Antonio Murdaca ---- - daemon/graphdriver/devmapper/deviceset.go | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/daemon/graphdriver/devmapper/deviceset.go b/daemon/graphdriver/devmapper/deviceset.go -index 51eaf45..2ef067c 100644 ---- a/daemon/graphdriver/devmapper/deviceset.go -+++ b/daemon/graphdriver/devmapper/deviceset.go -@@ -29,8 +29,8 @@ import ( - "github.com/docker/docker/pkg/mount" - "github.com/docker/docker/pkg/parsers" - "github.com/docker/go-units" -- - "github.com/opencontainers/runc/libcontainer/label" -+ pkgerr "github.com/pkg/errors" - ) - - var ( -@@ -2719,10 +2719,10 @@ func NewDeviceSet(root string, doInit bool, options []string, uidMaps, gidMaps [ - case "dm.libdm_log_level": - level, err := strconv.ParseInt(val, 10, 32) - if err != nil { -- return nil, errors.Wrapf(err, "could not parse `dm.libdm_log_level=%s`", val) -+ return nil, pkgerr.Wrapf(err, "could not parse `dm.libdm_log_level=%s`", val) - } - if level < devicemapper.LogLevelFatal || level > devicemapper.LogLevelDebug { -- return nil, errors.Errorf("dm.libdm_log_level must be in range [%d,%d]", devicemapper.LogLevelFatal, devicemapper.LogLevelDebug) -+ return nil, pkgerr.Errorf("dm.libdm_log_level must be in range [%d,%d]", devicemapper.LogLevelFatal, devicemapper.LogLevelDebug) - } - // Register a new logging callback with the specified level. - devicemapper.LogInit(devicemapper.DefaultLogger{ --- -1.8.3.1 - diff --git a/SOURCES/docker-latest.service b/SOURCES/docker-latest.service index 93f6d0a..f229e7a 100644 --- a/SOURCES/docker-latest.service +++ b/SOURCES/docker-latest.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 Wants=docker-latest-storage-setup.service +Requires=rhel-push-plugin.socket [Service] Type=notify @@ -16,6 +17,7 @@ Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin ExecStart=/usr/bin/dockerd-latest \ --add-runtime docker-runc=/usr/libexec/docker/docker-runc-latest \ --default-runtime=docker-runc \ + --authorization-plugin=rhel-push-plugin \ --exec-opt native.cgroupdriver=systemd \ --userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \ --seccomp-profile=/etc/docker-latest/seccomp.json \ diff --git a/SOURCES/docker-latest.sysconfig b/SOURCES/docker-latest.sysconfig index b240c20..7bf6915 100644 --- a/SOURCES/docker-latest.sysconfig +++ b/SOURCES/docker-latest.sysconfig @@ -8,7 +8,7 @@ DOCKER_CERT_PATH=/etc/docker # 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-latest.spec b/SPECS/docker-latest.spec index 24e2c56..e11bca4 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -22,11 +22,11 @@ # macros for 'docker' package VR %global docker_epoch 2 %global docker_ver 1.12.6 -%global docker_rel 48 +%global docker_rel 50 # docker %global git_docker https://github.com/projectatomic/docker -%global commit_docker cd75c685c826fed6d0954ac2334032e5c12bf675 +%global commit_docker 28ae36d7df49e8ab36863fa6e61826c9df559a64 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch docker-1.13.1-rhel @@ -46,7 +46,7 @@ # docker-runc %global git_runc https://github.com/projectatomic/runc -%global commit_runc 79db05ff0192bae1d0e505b93c5ac28818beb441 +%global commit_runc b59a6bb6e7278a3823f45691f82ac563bc083c9c %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) # docker-containerd @@ -61,12 +61,12 @@ # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork f81e09a9a9d83112aba6d6316d9fb4cea0035870 +%global commit_libnetwork da27c78d6fc6f020675fc7eddfa48858112cfb34 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) Name: %{repo}-latest Version: 1.13.1 -Release: 21.1.git%{shortcommit_docker}%{?dist} +Release: 23.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -91,7 +91,6 @@ Source16: %{name}-cleanup.timer Source17: daemon.json Source18: seccomp.json #Source13: %%{repo}-containerd.service -Patch0: 0001-adjust-pkg-errors-imports.patch BuildRequires: cmake BuildRequires: git BuildRequires: glibc-static @@ -105,38 +104,12 @@ BuildRequires: sqlite-devel BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: pkgconfig(systemd) -Requires: device-mapper-libs >= 7:1.02.97 -Requires: container-selinux >= 2:2.10-2 Requires: %{repo}-common >= %{docker_epoch}:%{docker_ver}-%{docker_rel} Requires: %{repo}-client-latest = %{version}-%{release} -#Requires: %{repo}-rhel-push-plugin >= %{docker_epoch}:%{docker_ver}-%{docker_rel} -Requires: oci-register-machine >= 1:0-3.10 -Requires: oci-systemd-hook >= 1:0.1.4-9 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd - -# Resolves: rhbz#1045220 -Requires: xz -Provides: lxc-%{name} = %{version}-%{release} - -# Match with upstream name Provides: %{repo}-engine-latest = %{version}-%{release} - -# needs tar to be able to run containers -Requires: tar - -#Requires: subscription-manager-plugin-container - -# include d-s-s into main docker package and obsolete existing d-s-s rpm -# also update BRs and Rs -Requires: lvm2 >= 7:1.02.97 -Requires: xfsprogs -Obsoletes: %{repo}-storage-setup <= 0.5-3 - -Requires: skopeo-containers -Requires: gnupg - Requires: criu %description @@ -198,9 +171,9 @@ Requires: %{repo}-common cp %{SOURCE9} . # rhel debranding for centos -#%if 0%{?centos} -#sed -i 's/ADD_REGISTRY/#ADD_REGISTRY/' %{SOURCE6} -#%endif +%if 0%{?centos} +sed -i 's/ADD_REGISTRY/#ADD_REGISTRY/' %{SOURCE6} +%endif # untar d-s-s tar zxf %{SOURCE1} @@ -365,11 +338,11 @@ install -p contrib/udev/80-%{repo}.rules %{buildroot}%{_udevrulesdir}/80-%{name} install -d %{buildroot}%{_sharedstatedir}/%{name} # install secret patch directory -#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}%{_sysconfdir}/%{name}/certs.d/redhat.{com,io} mkdir -p %{buildroot}/etc/%{name}/certs.d/registry.access.redhat.com @@ -491,8 +464,8 @@ exit 0 %{_unitdir}/%{name}-cleanup.service %{_unitdir}/%{name}-cleanup.timer %{_datadir}/bash-completion/completions/%{name} -#%dir %{_datadir}/rhel -#%{_datadir}/rhel/* +%dir %{_datadir}/rhel +%{_datadir}/rhel/* %dir %{_sharedstatedir}/%{name} %{_udevrulesdir}/80-%{name}.rules %dir %{_sysconfdir}/%{name} @@ -543,8 +516,21 @@ exit 0 %endif # with_migrator %changelog -* Thu Sep 7 2017 Johnny Hughes - 1.13.1-21.1.gitcd75c68 -- Manual CentOS Debranding +* Tue Aug 08 2017 Lokesh Mandvekar - 1.13.1-23.git28ae36d +- built docker @projectatomic/docker-1.13.1-rhel commit 28ae36d +- built docker-runc @projectatomic/docker-1.13.1-rhel commit b59a6bb +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 89a5d2c +- built docker-init commit 4892d4d +- built libnetwork commit da27c78 + +* Wed Aug 02 2017 Lokesh Mandvekar - 1.13.1-22.git28ae36d +- Resolves: #1475950 +- Requires: docker >= 2:1.12.6-50 +- built docker @projectatomic/docker-1.13.1-rhel commit 28ae36d +- built docker-runc @projectatomic/docker-1.13.1-rhel commit b59a6bb +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 89a5d2c +- built docker-init commit 4892d4d +- built libnetwork commit e85aeed * Thu Jul 20 2017 Lokesh Mandvekar - 1.13.1-21.1.gitcd75c68 - Resolves: #1473333