forked from pool/docker
- Upgrade to docker-ce v18.06.1-ce. Upstream changelog:
https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce bsc#1102522 - Remove patches that were merged upstream: - bsc1102522-0001-18.06-disable-containerd-CRI-plugin.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=262
This commit is contained in:
Aleksa Sarai
Git OBS Bridge
parent
060769c15c
commit
9e5d7d7464
4
_service
4
_service
@ -3,8 +3,8 @@
|
||||
<param name="url">https://github.com/docker/docker-ce.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">18.06.0_ce</param>
|
||||
<param name="revision">v18.06.0-ce</param>
|
||||
<param name="versionformat">18.06.1_ce</param>
|
||||
<param name="revision">v18.06.1-ce</param>
|
||||
<param name="filename">docker</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 690b89f58f34dc03333988577d49bae04a11a27c Mon Sep 17 00:00:00 2001
|
||||
From 3464bd58d266b0640774952e825558044ffc64e2 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksa Sarai <asarai@suse.de>
|
||||
Date: Sun, 8 Apr 2018 20:21:30 +1000
|
||||
Subject: [PATCH 1/2] apparmor: allow receiving of signals from 'docker kill'
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 45d68c6f85da51dc6e292ce09855e79794fd8984 Mon Sep 17 00:00:00 2001
|
||||
From 0954810e947abf0b4e5d8f6c78598c5d66b43952 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksa Sarai <asarai@suse.de>
|
||||
Date: Fri, 29 Jun 2018 17:59:30 +1000
|
||||
Subject: [PATCH 2/2] apparmor: clobber docker-default profile on start
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 6cba061d6d42e2e40267dbf8628480ec0c5d376a Mon Sep 17 00:00:00 2001
|
||||
From 547870ff2904a75fa3e0ee96fa264d53a81d4c01 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksa Sarai <asarai@suse.de>
|
||||
Date: Mon, 30 Jul 2018 19:34:01 +1000
|
||||
Subject: [PATCH] build: add -buildmode=pie
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 7ed2f5078916c4addd321d12bce49f40bf32680e Mon Sep 17 00:00:00 2001
|
||||
From: Aleksa Sarai <asarai@suse.de>
|
||||
Date: Tue, 21 Aug 2018 19:42:53 +1000
|
||||
Subject: [PATCH] 18.06: disable containerd CRI plugin
|
||||
|
||||
Docker 18.06 does not have a configuration option to disable the CRI
|
||||
plugin, and this plugin is not very useful if containerd is not running
|
||||
standalone.
|
||||
|
||||
This patch disables the plugin if containerd is running as child-process
|
||||
of dockerd.
|
||||
|
||||
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
|
||||
Signed-off-by: Aleksa Sarai <asarai@suse.de>
|
||||
---
|
||||
components/engine/libcontainerd/remote_daemon_linux.go | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/components/engine/libcontainerd/remote_daemon_linux.go b/components/engine/libcontainerd/remote_daemon_linux.go
|
||||
index dc59eb8c14f0..34b04e299acd 100644
|
||||
--- a/components/engine/libcontainerd/remote_daemon_linux.go
|
||||
+++ b/components/engine/libcontainerd/remote_daemon_linux.go
|
||||
@@ -37,6 +37,10 @@ func (r *remote) setDefaults() {
|
||||
if r.snapshotter == "" {
|
||||
r.snapshotter = "overlay"
|
||||
}
|
||||
+ // Disable CRI plugin by default if containerd is managed as child-process
|
||||
+ // of dockerd. See https://github.com/moby/moby/issues/37507
|
||||
+ r.DisabledPlugins = append(r.DisabledPlugins, "cri")
|
||||
+ delete(r.pluginConfs.Plugins, "cri")
|
||||
}
|
||||
|
||||
func (r *remote) stopDaemon() {
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df4b5d33d8a1d17c4707fe9610a33bd8a1618ae7a7d3a0fa0b8c38ed1d1d53e1
|
||||
size 8550432
|
||||
3
docker-18.06.1_ce.tar.xz
Normal file
3
docker-18.06.1_ce.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:061ae523be13dbe05ff5377626113a299327cc39fc145f801cd674c67b8c7fe0
|
||||
size 8561132
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
- Remove patches that were merged upstream:
|
||||
- bsc1102522-0001-18.06-disable-containerd-CRI-plugin.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 21 09:50:01 UTC 2018 - asarai@suse.com
|
||||
|
||||
|
||||
12
docker.spec
12
docker.spec
@ -42,17 +42,17 @@
|
||||
# helpfully injects into our build environment from the changelog). If you want
|
||||
# to generate a new git_commit_epoch, use this:
|
||||
# $ date --date="$(git show --format=fuller --date=iso $COMMIT_ID | grep -oP '(?<=^CommitDate: ).*')" '+%s'
|
||||
%define git_version f4ffd2511ce9
|
||||
%define git_commit_epoch 1508606827
|
||||
%define git_version e68fc7a215d7
|
||||
%define git_commit_epoch 1534871791
|
||||
|
||||
# These are the git commits required. We verify them against the source to make
|
||||
# sure we didn't miss anything important when doing upgrades.
|
||||
%define required_containerd d64c661f1d51c48782c9cec8fda7604785f93587
|
||||
%define required_containerd 468a545b9edcd5932818eb9de8e72413e616e86e
|
||||
%define required_dockerrunc 69663f0bd4b60df09991c08812a60108003fa340
|
||||
%define required_libnetwork 3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b
|
||||
|
||||
Name: %{realname}%{name_suffix}
|
||||
Version: 18.06.0_ce
|
||||
Version: 18.06.1_ce
|
||||
Release: 0
|
||||
Summary: The Linux container runtime
|
||||
License: Apache-2.0
|
||||
@ -82,8 +82,6 @@ Patch400: bsc1073877-0001-apparmor-allow-receiving-of-signals-from-docker-
|
||||
Patch401: bsc1073877-0002-apparmor-clobber-docker-default-profile-on-start.patch
|
||||
# SUSE-BACKPORT: Backport of https://github.com/docker/cli/pull/1242. bsc#1100727
|
||||
Patch402: bsc1100727-0001-build-add-buildmode-pie.patch
|
||||
# SUSE-BACKPORT: Backport of https://github.com/docker/engine/pull/29. bsc#1102522
|
||||
Patch403: bsc1102522-0001-18.06-disable-containerd-CRI-plugin.patch
|
||||
# SUSE-FEATURE: Add support to mirror inofficial/private registries
|
||||
# (https://github.com/moby/moby/pull/34319)
|
||||
Patch500: private-registry-0001-Add-private-registry-mirror-support.patch
|
||||
@ -263,8 +261,6 @@ docker container runtime configuration for kubeadm
|
||||
%patch401 -p1
|
||||
# bsc#1100727
|
||||
%patch402 -p1
|
||||
# bsc#1102522
|
||||
%patch403 -p1
|
||||
%if "%flavour" == "kubic"
|
||||
# PATCH-SUSE: Mirror patch.
|
||||
%patch500 -p1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From a709df0266457218086de2747c70a1b001fe745f Mon Sep 17 00:00:00 2001
|
||||
From 46c2590f7637dba208b3db7e44c04e24f33c436d Mon Sep 17 00:00:00 2001
|
||||
From: Valentin Rothberg <vrothberg@suse.com>
|
||||
Date: Mon, 2 Jul 2018 13:37:34 +0200
|
||||
Subject: [PATCH] Add private-registry mirror support
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 72ca29ce89146ac0c9a47881ebfc10883ed8ed39 Mon Sep 17 00:00:00 2001
|
||||
From 95a40e4f18c80cce91f16c6dff08e13642de54da Mon Sep 17 00:00:00 2001
|
||||
From: Aleksa Sarai <asarai@suse.de>
|
||||
Date: Wed, 8 Mar 2017 12:41:54 +1100
|
||||
Subject: [PATCH 1/2] daemon: allow directory creation in /run/secrets
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 4b300d3fabe2c8fa7292967c63a83eb82a30925a Mon Sep 17 00:00:00 2001
|
||||
From f178392f98b42bf36ff8d8c6a23c8caab9ac10f7 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksa Sarai <asarai@suse.de>
|
||||
Date: Wed, 8 Mar 2017 11:43:29 +1100
|
||||
Subject: [PATCH 2/2] SUSE: implement SUSE container secrets
|
||||
|
||||
Loading…
Reference in New Issue
Block a user