From 7ef6736d925e113841307406e16ae7b3006187ff Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 26 2018 07:34:58 +0000 Subject: import docker-1.13.1-75.git8633870.el7_5 --- diff --git a/.docker.metadata b/.docker.metadata index a056889..8a146cd 100644 --- a/.docker.metadata +++ b/.docker.metadata @@ -1,9 +1,9 @@ -f14a0342d360a9db8d2c0f40afa79b81e7408a2d SOURCES/6e3bb8e8721429ad4018bf633bff82eabdb6ad35.tar.gz +eb3534bc206419fd8a55c53ff1e64dfebf124f3a SOURCES/8633870faeff2c03dd6a75fdef9c2976379339c6.tar.gz 9e9e55d86e9df69ce17c8186d6ead913273f02cf SOURCES/container-storage-setup-e0997c3.tar.gz 3d4e57f6236139b11acce831d5a8b8dc9555ec46 SOURCES/containerd-c769d58.tar.gz c5e6169ea101c97d94257f48fa227f5ff0501454 SOURCES/docker-lvm-plugin-20a1f68.tar.gz 0beb6283e30f1e87e907576f4571ccb0a48b6be5 SOURCES/docker-novolume-plugin-385ec70.tar.gz -34d64260ca3469bd7cb9ac3013fd14a589d0e53b SOURCES/libnetwork-d00ceed.tar.gz +62ad0155c8906bf04f5088bd0ceb91ff1615a9d7 SOURCES/libnetwork-a5a6ca3.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 8ef390f..1a60ac6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ -SOURCES/6e3bb8e8721429ad4018bf633bff82eabdb6ad35.tar.gz +SOURCES/8633870faeff2c03dd6a75fdef9c2976379339c6.tar.gz SOURCES/container-storage-setup-e0997c3.tar.gz SOURCES/containerd-c769d58.tar.gz SOURCES/docker-lvm-plugin-20a1f68.tar.gz SOURCES/docker-novolume-plugin-385ec70.tar.gz -SOURCES/libnetwork-d00ceed.tar.gz +SOURCES/libnetwork-a5a6ca3.tar.gz SOURCES/rhel-push-plugin-af9107b.tar.gz SOURCES/runc-5eda6f6.tar.gz SOURCES/tini-fec3683.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 6d08514..c9fcb19 100644 --- a/SPECS/docker.spec +++ b/SPECS/docker.spec @@ -25,7 +25,7 @@ # docker %global git_docker https://github.com/projectatomic/docker -%global commit_docker 6e3bb8e8721429ad4018bf633bff82eabdb6ad35 +%global commit_docker 8633870faeff2c03dd6a75fdef9c2976379339c6 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7}) # docker_branch used in %%check %global docker_branch %{name}-%{version} @@ -73,13 +73,13 @@ # docker-proxy %global git_libnetwork https://github.com/docker/libnetwork -%global commit_libnetwork d00ceed44cc447c77f25cdf5d59e83163bdcb4c9 +%global commit_libnetwork a5a6ca30d6909649b2bcc21b6932cb93ccda9f7c %global shortcommit_libnetwork %(c=%{commit_libnetwork}; echo ${c:0:7}) Name: %{repo} Epoch: 2 Version: 1.13.1 -Release: 74.git%{shortcommit_docker}%{?dist} +Release: 75.git%{shortcommit_docker}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{import_path} @@ -717,6 +717,17 @@ fi %{_bindir}/%{name}-v1.10-migrator-* %changelog +* Wed Sep 12 2018 Lokesh Mandvekar - 2:1.13.1-75.git8633870 +- Resolves: #1625457, #1625022 +- built docker @projectatomic/docker-1.13.1-rhel commit 8633870 +- built docker-novolume-plugin commit 385ec70 +- built rhel-push-plugin commit af9107b +- built docker-lvm-plugin commit 20a1f68 +- built docker-runc @projectatomic/docker-1.13.1-rhel commit 5eda6f6 +- built docker-containerd @projectatomic/docker-1.13.1-rhel commit c769d58 +- built docker-init commit fec3683 +- built libnetwork commit a5a6ca3 + * Wed Aug 01 2018 Frantisek Kluknavsky - 2:1.13.1-74.git6e3bb8e - Resolves: #1603201 - built docker @projectatomic/docker-1.13.1-rhel commit 6e3bb8e