diff --git a/.docker.metadata b/.docker.metadata index 2f39dc4..759f1ee 100644 --- a/.docker.metadata +++ b/.docker.metadata @@ -1,9 +1,9 @@ -3e38eb46a96ca48b28d06945543012f804be810e SOURCES/774336db27bb8931c1705e47781b3842d290c968.tar.gz +c6923103ffa2030844dc0292dd5975443e12eb5c SOURCES/87f2fab3d32f145760b94b87b93daa83e6841ee7.tar.gz 9e9e55d86e9df69ce17c8186d6ead913273f02cf SOURCES/container-storage-setup-e0997c3.tar.gz 402d105d5ed40a9820d41b3f677df07c566393c9 SOURCES/containerd-296f1f8.tar.gz b0ba595ce2314c59ebbd53400f7f64809331a6b9 SOURCES/docker-lvm-plugin-8647404.tar.gz 0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz -fb49d4dd60e576f3a6412c2885256f8954fa5236 SOURCES/libnetwork-14db3c4.tar.gz +f2f7c536bb870f5edc41a86d70c84439f5f638e3 SOURCES/libnetwork-2bf6330.tar.gz 965d64f5a81c3a428ca3b29495ecf66748c67c1f SOURCES/rhel-push-plugin-af9107b.tar.gz 78795d104677625593c70e1dbe569f235b5af0c5 SOURCES/runc-e9c345b.tar.gz c5c3577b90edc8902f3dd888e55334ba6e9e1ddf SOURCES/tini-5b117de.tar.gz diff --git a/.gitignore b/.gitignore index 4a29b61..9deaf72 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ -SOURCES/774336db27bb8931c1705e47781b3842d290c968.tar.gz +SOURCES/87f2fab3d32f145760b94b87b93daa83e6841ee7.tar.gz SOURCES/container-storage-setup-e0997c3.tar.gz SOURCES/containerd-296f1f8.tar.gz SOURCES/docker-lvm-plugin-8647404.tar.gz SOURCES/docker-novolume-plugin-385ec70.tar.gz -SOURCES/libnetwork-14db3c4.tar.gz +SOURCES/libnetwork-2bf6330.tar.gz SOURCES/rhel-push-plugin-af9107b.tar.gz SOURCES/runc-e9c345b.tar.gz SOURCES/tini-5b117de.tar.gz diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/docker.service b/SOURCES/docker.service index 7a53857..572b5f6 100644 --- a/SOURCES/docker.service +++ b/SOURCES/docker.service @@ -22,6 +22,7 @@ ExecStart=/usr/bin/dockerd-current \ --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 \ --seccomp-profile=/etc/docker/seccomp.json \ $OPTIONS \ $DOCKER_STORAGE_OPTIONS \ @@ -36,7 +37,6 @@ LimitNPROC=1048576 LimitCORE=infinity TimeoutStartSec=0 Restart=on-abnormal -MountFlags=slave KillMode=process [Install] diff --git a/SPECS/docker.spec b/SPECS/docker.spec index 41d573c..f53d768 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 774336db27bb8931c1705e47781b3842d290c968 +%global commit_docker 87f2fab3d32f145760b94b87b93daa83e6841ee7 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch %{name}-%{version} @@ -72,13 +72,13 @@ # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork 14db3c494c259b8caa159a244a8e9708e3f4b595 +%global commit_libnetwork 2bf63300c52f5ea61989f85c732f00097d746530 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) Name: %{repo} Epoch: 2 Version: 1.13.1 -Release: 53.git%{shortcommit_docker}%{?dist} +Release: 58.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{import_path} @@ -176,15 +176,15 @@ running and skip checksum calculation on startup. %package common Summary: Common files for docker and docker-latest Requires: device-mapper-libs >= 7:1.02.97 -Requires: oci-umount >= 2:2.0.0-1 +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: subscription-manager-plugin-container Requires: xz Requires: atomic-registries -Requires: container-selinux >= 2:2.21-2 -Requires: container-storage-setup >= 0.7.0-1 +Requires: container-selinux >= 2:2.51-1 +Requires: container-storage-setup >= 0.9.0-1 # rhbz#1214070 - update deps for d-s-s Requires: lvm2 >= 2.02.112 Requires: xfsprogs @@ -318,8 +318,8 @@ popd mkdir _build %global version_tag %{name}-%{version}-%{release}.%{_arch} -#%%{__sed} -r -i 's/^([\t ]*PkgVersion:[\t ]*)"",$/\1"%{version_tag}",/' daemon/info.go -#%%{__sed} -r -i 's/^([\t ]*PkgVersion:[\t ]*)"",$/\1"%{version_tag}",/' api/client/system/version.go +%{__sed} -r -i 's/^([\t ]*PkgVersion:[\t ]*)"",$/\1"%{version_tag}",/' daemon/info.go +%{__sed} -r -i 's/^([\t ]*PkgVersion:[\t ]*)"",$/\1"%{version_tag}",/' cli/command//system/version.go pushd _build mkdir -p src/%{provider}.%{provider_tld}/{%{name},projectatomic} @@ -368,7 +368,7 @@ popd # build %%{repo}-runc pushd runc-%{commit_runc} -make BUILDTAGS="seccomp selinux" +make BUILDTAGS="seccomp selinux" COMMIT=%{commit_runc} popd # build %%{name}-containerd @@ -382,6 +382,7 @@ popd # build docker-init pushd tini-%{commit_tini} cmake -DMINIMAL=ON . +sed -i 's/#define TINI_GIT ""/#define TINI_GIT " - git.%{commit_tini}"/g' tiniConfig.h make tini-static popd @@ -716,8 +717,34 @@ fi %{_bindir}/%{name}-v1.10-migrator-* %changelog -* Tue Feb 20 2018 Lokesh Mandvekar - 2:1.13.1-53.git774336d -- Resolves: #1540540 +* Mon Mar 19 2018 Lokesh Mandvekar - 2:1.13.1-58.git87f2fab +- built docker @projectatomic/docker-1.13.1-rhel commit 87f2fab +- built docker-novolume-plugin commit 385ec70 +- built rhel-push-plugin commit af9107b +- built docker-lvm-plugin commit 8647404 +- built docker-runc @projectatomic/docker-1.13.1-rhel commit e9c345b +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit 296f1f8 +- built oci-umount commit +- built docker-init commit 5b117de +- built libnetwork commit 2bf6330 + +* Wed Mar 14 2018 Lokesh Mandvekar - 2:1.13.1-57.gitaacbc4b +- Resolves: #1489517 +- built docker @projectatomic/docker-1.13.1-rhel commit aacbc4b +- built docker-novolume-plugin commit 385ec70 +- built rhel-push-plugin commit af9107b +- built docker-lvm-plugin commit 8647404 +- 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 8892d75 + +* Sat Mar 10 2018 Lokesh Mandvekar - 2:1.13.1-56.git774336d +- Resolves: #1485832 +- bump deps on container-selinux and oci-umount to the latest shipped + +* Tue Feb 20 2018 Lokesh Mandvekar - 2:1.13.1-55.rhel75.git774336d +- Re: #1540540 - built docker @projectatomic/docker-1.13.1-rhel commit 774336d - built docker-novolume-plugin commit 385ec70 - built rhel-push-plugin commit af9107b @@ -727,8 +754,7 @@ fi - built docker-init commit 5b117de - built libnetwork commit 14db3c4 -* Mon Feb 12 2018 Lokesh Mandvekar - 2:1.13.1-52.gitce62987 -- Resolves: #1534827, #1543575 +* Mon Feb 12 2018 Lokesh Mandvekar - 2:1.13.1-54.rhel75.gitce62987 - built docker @projectatomic/docker-1.13.1-rhel commit ce62987 - built docker-novolume-plugin commit 385ec70 - built rhel-push-plugin commit af9107b @@ -738,6 +764,12 @@ fi - built docker-init commit 0effd37 - built libnetwork commit 1ba8194 +* Tue Feb 06 2018 Frantisek Kluknavsky - 2:1.13.1-50.gitec9911e +- Requires: container-storage-setup >= 0.9.0-1 + +* Tue Feb 06 2018 Lokesh Mandvekar - 2:1.13.1-49.gitec9911e +- Resolves: #1441743 - remove MountFlags=slave from unitfile + * Mon Feb 05 2018 Lokesh Mandvekar - 2:1.13.1-48.gitec9911e - Resolves: #1536726 - bump skopeo-containers dependency