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:
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
|
||||
|
Reference in New Issue
Block a user