diff --git a/.docker.metadata b/.docker.metadata index 759f1ee..b00f0b3 100644 --- a/.docker.metadata +++ b/.docker.metadata @@ -1,9 +1,9 @@ -c6923103ffa2030844dc0292dd5975443e12eb5c SOURCES/87f2fab3d32f145760b94b87b93daa83e6841ee7.tar.gz +5f2ee34452a1cdf1a47cbb288779db277384360f SOURCES/94f42401bf8b413eac9dbb0e4065fa5bcb640696.tar.gz 9e9e55d86e9df69ce17c8186d6ead913273f02cf SOURCES/container-storage-setup-e0997c3.tar.gz 402d105d5ed40a9820d41b3f677df07c566393c9 SOURCES/containerd-296f1f8.tar.gz -b0ba595ce2314c59ebbd53400f7f64809331a6b9 SOURCES/docker-lvm-plugin-8647404.tar.gz +59ad98a21ceca5617c1b8f8fdd6feb421ab16367 SOURCES/docker-lvm-plugin-04caa55.tar.gz 0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz -f2f7c536bb870f5edc41a86d70c84439f5f638e3 SOURCES/libnetwork-2bf6330.tar.gz +b2e15cf176c0f24816d49903c19a9561c869aa12 SOURCES/libnetwork-5c1218c.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 9deaf72..84c6e95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ -SOURCES/87f2fab3d32f145760b94b87b93daa83e6841ee7.tar.gz +SOURCES/94f42401bf8b413eac9dbb0e4065fa5bcb640696.tar.gz SOURCES/container-storage-setup-e0997c3.tar.gz SOURCES/containerd-296f1f8.tar.gz -SOURCES/docker-lvm-plugin-8647404.tar.gz +SOURCES/docker-lvm-plugin-04caa55.tar.gz SOURCES/docker-novolume-plugin-385ec70.tar.gz -SOURCES/libnetwork-2bf6330.tar.gz +SOURCES/libnetwork-5c1218c.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/SPECS/docker.spec b/SPECS/docker.spec index f53d768..8bec44e 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 87f2fab3d32f145760b94b87b93daa83e6841ee7 +%global commit_docker 94f42401bf8b413eac9dbb0e4065fa5bcb640696 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch %{name}-%{version} @@ -52,7 +52,7 @@ # docker-lvm-plugin %global git_lvm https://github.com/projectatomic/%{repo}-lvm-plugin -%global commit_lvm 8647404eed561d32835d6bc032b1c330ee31ed5b +%global commit_lvm 04caa55d50d614d11d542b187d8faa33f13b116e %global shortcommit_lvm %(c=%{commit_lvm}; echo ${c:0:7}) # docker-runc @@ -72,13 +72,13 @@ # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork 2bf63300c52f5ea61989f85c732f00097d746530 +%global commit_libnetwork 5c1218c956c99f3365711974e300087810c31379 %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) Name: %{repo} Epoch: 2 Version: 1.13.1 -Release: 58.git%{shortcommit_docker}%{?dist} +Release: 63.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{import_path} @@ -180,7 +180,6 @@ 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.51-1 @@ -717,6 +716,37 @@ fi %{_bindir}/%{name}-v1.10-migrator-* %changelog +* Mon Apr 30 2018 Frantisek Kluknavsky - 2:1.13.1-63.git94f4240 +- built docker @projectatomic/docker-1.13.1-rhel commit 94f4240 + +* Tue Apr 10 2018 Lokesh Mandvekar - 2:1.13.1-62.gitc6c9b51 +- built docker @projectatomic/docker-1.13.1-rhel commit c6c9b51 +- 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 oci-umount commit +- built docker-init commit 5b117de +- built libnetwork commit 5c1218c + +* Fri Apr 06 2018 Lokesh Mandvekar - 2:1.13.1-61.git87f2fab +- do not change commit id for docker at this stage + +* Fri Apr 06 2018 Lokesh Mandvekar - 2:1.13.1-60.git2d99c6f +- remove dep on subscription-manager-plugin-container + +* Mon Mar 26 2018 Daniel J Walsh - 2:1.13.1-59.git2d99c6f +- built docker @projectatomic/docker-1.13.1-rhel commit 2d99c6f +- 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 + * 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