Accepting request 646380 from Virtualization:containers

- Update changelogs to mention bsc#1113313.
- Add backport of https://github.com/containerd/containerd/pull/2764, which is
  required for us to build containerd on i586 SLE-12 (where /bin/sh doesn't
  like emoji in shell scripts). bsc#1102522 bsc#1113313

OBS-URL: https://build.opensuse.org/request/show/646380
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=82
This commit is contained in:
Dominique Leuenberger 2018-11-05 21:56:51 +00:00 committed by Git OBS Bridge
commit 73c300a8c0

View File

@ -8,12 +8,12 @@ Mon Oct 8 06:41:21 UTC 2018 - Valentin Rothberg <vrothberg@suse.com>
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 4 08:32:43 UTC 2018 - rbrown@suse.com Tue Sep 4 08:32:43 UTC 2018 - rbrown@suse.com
- ExcludeArch i586 for entire docker-kubic flavour - ExcludeArch i586 for entire docker-kubic flavour
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 4 07:32:47 UTC 2018 - rbrown@suse.com Tue Sep 4 07:32:47 UTC 2018 - rbrown@suse.com
- ExcludeArch i586 for docker-kubic-kubeadm-criconfig subpackage - ExcludeArch i586 for docker-kubic-kubeadm-criconfig subpackage
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 24 08:17:41 UTC 2018 - asarai@suse.com Fri Aug 24 08:17:41 UTC 2018 - asarai@suse.com
@ -25,8 +25,9 @@ Fri Aug 24 08:17:41 UTC 2018 - asarai@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 22 09:54:57 UTC 2018 - asarai@suse.com Wed Aug 22 09:54:57 UTC 2018 - asarai@suse.com
- Upgrade to docker-ce v18.06.1-ce. Upstream changelog: - Upgrade to docker-ce v18.06.1-ce. bsc#1102522 bsc#1113313
https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce bsc#1102522 Upstream changelog:
https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce
- Remove patches that were merged upstream: - Remove patches that were merged upstream:
- bsc1102522-0001-18.06-disable-containerd-CRI-plugin.patch - bsc1102522-0001-18.06-disable-containerd-CRI-plugin.patch