From 269847c9f6f1ce0b232eeeb840bdb8e9a25a3691c316d375a4fbd4211951ae24 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 3 Mar 2021 03:05:29 +0000 Subject: [PATCH] Accepting request 876331 from home:cyphar:docker - Update to Docker 20.10.5-ce. See upstream changelog in the packaged /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1182947 - Update runc dependency to 1.0.0~rc93. - Remove upstreamed patches: - cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch - Rebase patches: * 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch * 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch * 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch * 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch - Switch version to use -ce suffix rather than _ce to avoid confusing other tools. boo#1182476 OBS-URL: https://build.opensuse.org/request/show/876331 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=359 --- ...llow-directory-creation-in-run-secre.patch | 4 +- ...USE-implement-SUSE-container-secrets.patch | 4 +- ...-add-private-registry-mirror-support.patch | 4 +- ...mor-clobber-docker-default-profile-o.patch | 6 +- _service | 8 +-- ...1-Rename-bin-md2man-to-bin-go-md2man.patch | 59 ------------------- docker-20.10.3_ce_46229ca1d815.tar.xz | 3 - docker-20.10.5_ce_363e9a88a11b.tar.xz | 3 + docker-cli-20.10.3_ce.tar.xz | 3 - docker-cli-20.10.5_ce.tar.xz | 3 + docker.changes | 16 +++++ docker.spec | 17 +++--- 12 files changed, 43 insertions(+), 87 deletions(-) delete mode 100644 cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch delete mode 100644 docker-20.10.3_ce_46229ca1d815.tar.xz create mode 100644 docker-20.10.5_ce_363e9a88a11b.tar.xz delete mode 100644 docker-cli-20.10.3_ce.tar.xz create mode 100644 docker-cli-20.10.5_ce.tar.xz diff --git a/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch b/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch index b86f4e8..c30fad5 100644 --- a/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch +++ b/0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch @@ -1,4 +1,4 @@ -From 1edf7a140c843cc6db85cdea298db19fee316dcb Mon Sep 17 00:00:00 2001 +From 6a5d238a42b8adc5d29bbd9bd688aa1034f5cdfd Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 8 Mar 2017 12:41:54 +1100 Subject: [PATCH 1/4] SECRETS: daemon: allow directory creation in /run/secrets @@ -70,5 +70,5 @@ index 5521adbd2749..c103d9349c51 100644 return errors.Wrap(err, "error setting ownership for secret") } -- -2.30.0 +2.30.1 diff --git a/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch b/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch index bf80a1b..58cb947 100644 --- a/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch +++ b/0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch @@ -1,4 +1,4 @@ -From eaedebbcf735732c00e565ff6077f4374cc87519 Mon Sep 17 00:00:00 2001 +From bf083a6f80b204325673732944b53a447f9e4171 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 8 Mar 2017 11:43:29 +1100 Subject: [PATCH 2/4] SECRETS: SUSE: implement SUSE container secrets @@ -451,5 +451,5 @@ index 000000000000..9ee33adf7497 + return nil +} -- -2.30.0 +2.30.1 diff --git a/0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch b/0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch index 6abb229..f847574 100644 --- a/0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch +++ b/0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch @@ -1,4 +1,4 @@ -From aa173dd56730552524ab35d74acbe61709c732e2 Mon Sep 17 00:00:00 2001 +From 10d0381bf317221167af0930c552a8b27c7861a4 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 2 Jul 2018 13:37:34 +0200 Subject: [PATCH 3/4] PRIVATE-REGISTRY: add private-registry mirror support @@ -1142,5 +1142,5 @@ index 3e3a5b41ffbd..451a6f874bc1 100644 endpoints = []APIEndpoint{ -- -2.30.0 +2.30.1 diff --git a/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch b/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch index 308067a..8bf0f71 100644 --- a/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch +++ b/0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch @@ -1,4 +1,4 @@ -From eb4e0b351b4bb229bfd5fd3ed57d3c35040265e0 Mon Sep 17 00:00:00 2001 +From 8cf5f05b8bcb5588bec92d5732e81f26fa632fce Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Fri, 29 Jun 2018 17:59:30 +1000 Subject: [PATCH 4/4] bsc1073877: apparmor: clobber docker-default profile on @@ -69,7 +69,7 @@ index dd581dc7dadb..5b14979cd4a3 100644 return nil } diff --git a/daemon/daemon.go b/daemon/daemon.go -index 794ff9712d08..f9e727b348c5 100644 +index 3d8cca288010..62d3859cff8c 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -855,8 +855,9 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S @@ -85,5 +85,5 @@ index 794ff9712d08..f9e727b348c5 100644 } -- -2.30.0 +2.30.1 diff --git a/_service b/_service index 76f27b9..9b8545b 100644 --- a/_service +++ b/_service @@ -3,16 +3,16 @@ https://github.com/moby/moby.git git .git - 20.10.3_ce_%h - v20.10.3 + 20.10.5_ce_%h + v20.10.5 docker https://github.com/docker/cli.git git .git - 20.10.3_ce - v20.10.3 + 20.10.5_ce + v20.10.5 docker-cli diff --git a/cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch b/cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch deleted file mode 100644 index 0ccfab2..0000000 --- a/cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 6e2607c6a68ecf1a7378133f22cb7192e2eb9d5b Mon Sep 17 00:00:00 2001 -From: Arnaud Rebillout -Date: Wed, 16 Dec 2020 10:19:43 +0700 -Subject: [PATCH] Rename bin/md2man to bin/go-md2man - -In the recent PR !2877, some code was added to check if md2man is -already installed in the build environment. This is to cater to the -needs of Linux distributions. - -However it turns out that Linux distributions install md2man as -bin/go-md2man instead of bin/md2man, hence the PR !2877 doesn't help -much. - -This commit fixes it by settling on using the binary name go-md2man. - -For reference, here the file list of the package go-md2man in several -distributions: - -- Debian: -- Ubuntu: -- Fedora: -- ArchLinux: - -Signed-off-by: Arnaud Rebillout ---- - man/md2man-all.sh | 2 +- - scripts/docs/generate-man.sh | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/man/md2man-all.sh b/man/md2man-all.sh -index eb0bc6366a27..46c7b8f08eae 100755 ---- a/man/md2man-all.sh -+++ b/man/md2man-all.sh -@@ -18,5 +18,5 @@ for FILE in *.md; do - continue - fi - mkdir -p "./man${num}" -- md2man -in "$FILE" -out "./man${num}/${name}" -+ go-md2man -in "$FILE" -out "./man${num}/${name}" - done -diff --git a/scripts/docs/generate-man.sh b/scripts/docs/generate-man.sh -index 136ed1e00094..e312c87dd321 100755 ---- a/scripts/docs/generate-man.sh -+++ b/scripts/docs/generate-man.sh -@@ -4,9 +4,9 @@ set -eu -o pipefail - - mkdir -p ./man/man1 - --if ! command -v md2man &> /dev/null; then -+if ! command -v go-md2man &> /dev/null; then - # yay, go install creates a binary named "v2" ¯\_(ツ)_/¯ -- go build -o "/go/bin/md2man" ./vendor/github.com/cpuguy83/go-md2man/v2 -+ go build -o "/go/bin/go-md2man" ./vendor/github.com/cpuguy83/go-md2man/v2 - fi - - # Generate man pages from cobra commands --- -2.30.0 - diff --git a/docker-20.10.3_ce_46229ca1d815.tar.xz b/docker-20.10.3_ce_46229ca1d815.tar.xz deleted file mode 100644 index 8aefccd..0000000 --- a/docker-20.10.3_ce_46229ca1d815.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84fcc9d36db90c8b87a0b19d5846ade17e8dc4586e998e071c843fd8d43a0bef -size 6481288 diff --git a/docker-20.10.5_ce_363e9a88a11b.tar.xz b/docker-20.10.5_ce_363e9a88a11b.tar.xz new file mode 100644 index 0000000..5520c68 --- /dev/null +++ b/docker-20.10.5_ce_363e9a88a11b.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4bf5efa9032ba23ac7a9d49d1820f0e1fbc789dfeb8c7cdb6d4909a242dc1a4 +size 6483364 diff --git a/docker-cli-20.10.3_ce.tar.xz b/docker-cli-20.10.3_ce.tar.xz deleted file mode 100644 index 125a21c..0000000 --- a/docker-cli-20.10.3_ce.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8526bdb466209ffd1c3ef41fcfccb9588b67d507d4444701398d6f7987f5f16 -size 4450316 diff --git a/docker-cli-20.10.5_ce.tar.xz b/docker-cli-20.10.5_ce.tar.xz new file mode 100644 index 0000000..9774bb1 --- /dev/null +++ b/docker-cli-20.10.5_ce.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a95986b5c90e357b76bbc2251cbd6da9c4adc3d689d84fe165922824e4118b16 +size 4452156 diff --git a/docker.changes b/docker.changes index 283b16c..a901309 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Mar 3 00:49:58 UTC 2021 - Aleksa Sarai + +- Update to Docker 20.10.5-ce. See upstream changelog in the packaged + /usr/share/doc/packages/docker/CHANGELOG.md. bsc#1182947 +- Update runc dependency to 1.0.0~rc93. +- Remove upstreamed patches: + - cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch +- Rebase patches: + * 0001-SECRETS-daemon-allow-directory-creation-in-run-secre.patch + * 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch + * 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch + * 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch +- Switch version to use -ce suffix rather than _ce to avoid confusing other + tools. boo#1182476 + ------------------------------------------------------------------- Sun Feb 14 06:33:16 UTC 2021 - Aleksa Sarai diff --git a/docker.spec b/docker.spec index bedcf29..ea33933 100644 --- a/docker.spec +++ b/docker.spec @@ -42,8 +42,8 @@ # 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 46229ca1d815 -%define git_commit_epoch 1611869592 +%define git_version 363e9a88a11b +%define git_commit_epoch 1614234438 # We require a specific pin of libnetwork because it doesn't really do # versioning and minor version mismatches in libnetwork can break Docker @@ -56,7 +56,10 @@ %define proxy_builddir %{dist_builddir}/src/github.com/docker/libnetwork Name: %{realname}%{name_suffix} -Version: 20.10.3_ce +Version: 20.10.5_ce +# This "nice version" is so that docker --version gives a result that can be +# parsed by other people. boo#1182476 +%define nice_version 20.10.5-ce Release: 0 Summary: The Moby-project Linux container runtime License: Apache-2.0 @@ -89,8 +92,6 @@ Patch101: 0002-SECRETS-SUSE-implement-SUSE-container-secrets.patch Patch200: 0003-PRIVATE-REGISTRY-add-private-registry-mirror-support.patch # SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/37353. bsc#1073877 bsc#1099277 Patch300: 0004-bsc1073877-apparmor-clobber-docker-default-profile-o.patch -# SUSE-BACKPORT: Backport of https://github.com/docker/cli/pull/2888. -Patch301: cli-0001-Rename-bin-md2man-to-bin-go-md2man.patch BuildRequires: audit BuildRequires: bash-completion BuildRequires: ca-certificates @@ -117,7 +118,7 @@ Obsoletes: docker-libnetwork%{name_suffix} < 0.7.0.2 Provides: docker-libnetwork%{name_suffix} = 0.7.0.2.%{version} # Required to actually run containers. We require the minimum version that is # pinned by Docker, but in order to avoid headaches we allow for updates. -Requires: runc >= 1.0.0~rc92 +Requires: runc >= 1.0.0~rc93 Requires: containerd >= 1.4.3 # Needed for --init support. We don't use "tini", we use our own implementation # which handles edge-cases better. @@ -264,8 +265,6 @@ cp %{SOURCE103} . mkdir -p %{cli_builddir} pushd %{cli_builddir} xz -dc %{SOURCE1} | tar -xof - --strip-components=1 -# https://github.com/docker/cli/pull/2888 -%patch301 -p1 popd # Extract the docker-libnetwork source in a subdir. @@ -297,7 +296,7 @@ export BUILDFLAGS="-buildmode=pie" # Specify all of the versioning information. We use SOURCE_DATE_EPOCH if it's # been injected by rpmbuild, otherwise we use the hardcoded git_commit_epoch # generated above. boo#1064781 -export VERSION="$(cat ./VERSION 2>/dev/null || echo '%{version}')" +export VERSION="%{nice_version}" export DOCKER_GITCOMMIT="%{git_version}" export GITCOMMIT="%{git_version}" export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-%{git_commit_epoch}}"