From 0ca6dfbd71c7ee60fcae9942fbc1d3841eac4bce6f36bdad5e03c8ff07cf3837 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Mon, 5 Nov 2018 10:38:15 +0000 Subject: [PATCH] - 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/package/show/Virtualization:containers/docker?expand=0&rev=269 --- docker.changes | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker.changes b/docker.changes index cf7880d..0fb6e16 100644 --- a/docker.changes +++ b/docker.changes @@ -8,12 +8,12 @@ Mon Oct 8 06:41:21 UTC 2018 - Valentin Rothberg ------------------------------------------------------------------- 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 -- 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 @@ -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 -- Upgrade to docker-ce v18.06.1-ce. Upstream changelog: - https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce bsc#1102522 +- Upgrade to docker-ce v18.06.1-ce. bsc#1102522 bsc#1113313 + Upstream changelog: + https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce - Remove patches that were merged upstream: - bsc1102522-0001-18.06-disable-containerd-CRI-plugin.patch