Accepting request 1097636 from Virtualization:containers
OBS-URL: https://build.opensuse.org/request/show/1097636 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=134
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
a68968cfe4
8
_service
8
_service
@ -3,16 +3,16 @@
|
||||
<param name="url">https://github.com/moby/moby.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">24.0.2_ce_%h</param>
|
||||
<param name="revision">v24.0.2</param>
|
||||
<param name="versionformat">24.0.4_ce_%h</param>
|
||||
<param name="revision">v24.0.4</param>
|
||||
<param name="filename">docker</param>
|
||||
</service>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">https://github.com/docker/cli.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="exclude">.git</param>
|
||||
<param name="versionformat">24.0.2_ce</param>
|
||||
<param name="revision">v24.0.2</param>
|
||||
<param name="versionformat">24.0.4_ce</param>
|
||||
<param name="revision">v24.0.4</param>
|
||||
<param name="filename">docker-cli</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c46107746f7676a09590008584a17d3f907f7926 Mon Sep 17 00:00:00 2001
|
||||
From 3461d391fcee06e89b3bb4768bc15779d92388b8 Mon Sep 17 00:00:00 2001
|
||||
From: Aleksa Sarai <asarai@suse.de>
|
||||
Date: Wed, 26 Apr 2023 10:13:48 +1000
|
||||
Subject: [PATCH] docs: include required tools in source tree
|
||||
@ -395,7 +395,7 @@ index 4d0006e43e79..7d98e161df5d 100755
|
||||
mkdir -p docs/yaml
|
||||
set -x
|
||||
diff --git a/vendor.mod b/vendor.mod
|
||||
index 9b171b28e5b3..0aeec6f36cc5 100644
|
||||
index 93b252033bb8..694d6bb790e9 100644
|
||||
--- a/vendor.mod
|
||||
+++ b/vendor.mod
|
||||
@@ -8,7 +8,9 @@ go 1.18
|
||||
@ -406,7 +406,7 @@ index 9b171b28e5b3..0aeec6f36cc5 100644
|
||||
github.com/creack/pty v1.1.18
|
||||
+ github.com/docker/cli-docs-tool v0.5.1
|
||||
github.com/docker/distribution v2.8.2+incompatible
|
||||
github.com/docker/docker v24.0.1+incompatible
|
||||
github.com/docker/docker v24.0.2+incompatible
|
||||
github.com/docker/docker-credential-helpers v0.7.0
|
||||
@@ -67,6 +69,7 @@ require (
|
||||
github.com/prometheus/common v0.37.0 // indirect
|
||||
@ -423,7 +423,7 @@ index 9b171b28e5b3..0aeec6f36cc5 100644
|
||||
+ gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
diff --git a/vendor.sum b/vendor.sum
|
||||
index adb8ce424999..b577d7bb7242 100644
|
||||
index 15bc7cd703d3..55870c81da53 100644
|
||||
--- a/vendor.sum
|
||||
+++ b/vendor.sum
|
||||
@@ -85,6 +85,7 @@ github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u9
|
||||
@ -23717,7 +23717,7 @@ index 000000000000..e88f9c54aecb
|
||||
+
|
||||
+}
|
||||
diff --git a/vendor/modules.txt b/vendor/modules.txt
|
||||
index 5fc4fe641043..8dfd03ef0dd2 100644
|
||||
index 1baed2ba4d14..c3e1679730a4 100644
|
||||
--- a/vendor/modules.txt
|
||||
+++ b/vendor/modules.txt
|
||||
@@ -18,9 +18,17 @@ github.com/containerd/containerd/errdefs
|
||||
@ -23766,5 +23766,5 @@ index 5fc4fe641043..8dfd03ef0dd2 100644
|
||||
## explicit; go 1.13
|
||||
gotest.tools/v3/assert
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f16daeb991b6083d370c1c9876702a922c8f3fe0a7f7570b69f2b20f39eb5bee
|
||||
size 8771952
|
||||
3
docker-24.0.4_ce_4ffc61430bbe.tar.xz
Normal file
3
docker-24.0.4_ce_4ffc61430bbe.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3afe8f4cc394ae9450dc649cdc1512a431c5d4fc645d01ce4cc7be74e34a4161
|
||||
size 8785084
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:edb71f247bba95a0b395a8a6b67ecda8fec3cd393aea0553d22b9fc711870f6f
|
||||
size 3511708
|
||||
3
docker-cli-24.0.4_ce.tar.xz
Normal file
3
docker-cli-24.0.4_ce.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1dcce35801136750e1815a689911b7363f518abe58c6c04d0839d2622bd31802
|
||||
size 3514396
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 7 21:29:05 UTC 2023 - Aleksa Sarai <asarai@suse.com>
|
||||
|
||||
- Update to Docker 24.0.4-ce. See upstream changelog online at
|
||||
<https://docs.docker.com/engine/release-notes/24.0/#2404>.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 7 02:35:02 UTC 2023 - Aleksa Sarai <asarai@suse.com>
|
||||
|
||||
- Update to Docker 24.0.3-ce. See upstream changelog online at
|
||||
<https://docs.docker.com/engine/release-notes/24.0/#2403>. bsc#1213120
|
||||
- Rebase patches:
|
||||
* cli-0001-docs-include-required-tools-in-source-tree.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 29 10:07:13 UTC 2023 - Danish Prakash <danish.prakash@suse.com>
|
||||
|
||||
|
||||
@ -31,9 +31,9 @@
|
||||
# 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 real_version 24.0.2
|
||||
%define git_version 659604f9ee60
|
||||
%define git_commit_epoch 1685049742
|
||||
%define real_version 24.0.4
|
||||
%define git_version 4ffc61430bbe
|
||||
%define git_commit_epoch 1688740946
|
||||
|
||||
Name: docker
|
||||
Version: %{real_version}_ce
|
||||
@ -86,7 +86,7 @@ BuildRequires: fish
|
||||
BuildRequires: go-go-md2man
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: sysuser-tools
|
||||
BuildRequires: golang(API) = 1.19
|
||||
BuildRequires: golang(API) = 1.20
|
||||
%if 0%{?sle_version} >= 150000
|
||||
# This conditional only works on rpm>=4.13, which SLE 12 doesn't have. But we
|
||||
# don't need to support Docker+selinux for SLE 12 anyway.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user