diff --git a/_service b/_service
index 60ab142..ee40fbb 100644
--- a/_service
+++ b/_service
@@ -3,16 +3,16 @@
https://github.com/moby/moby.git
git
.git
- 24.0.2_ce_%h
- v24.0.2
+ 24.0.4_ce_%h
+ v24.0.4
docker
https://github.com/docker/cli.git
git
.git
- 24.0.2_ce
- v24.0.2
+ 24.0.4_ce
+ v24.0.4
docker-cli
diff --git a/cli-0001-docs-include-required-tools-in-source-tree.patch b/cli-0001-docs-include-required-tools-in-source-tree.patch
index 9508a8f..88ab997 100644
--- a/cli-0001-docs-include-required-tools-in-source-tree.patch
+++ b/cli-0001-docs-include-required-tools-in-source-tree.patch
@@ -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
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
diff --git a/docker-24.0.2_ce_659604f9ee60.tar.xz b/docker-24.0.2_ce_659604f9ee60.tar.xz
deleted file mode 100644
index a017bf0..0000000
--- a/docker-24.0.2_ce_659604f9ee60.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f16daeb991b6083d370c1c9876702a922c8f3fe0a7f7570b69f2b20f39eb5bee
-size 8771952
diff --git a/docker-24.0.4_ce_4ffc61430bbe.tar.xz b/docker-24.0.4_ce_4ffc61430bbe.tar.xz
new file mode 100644
index 0000000..214e9d8
--- /dev/null
+++ b/docker-24.0.4_ce_4ffc61430bbe.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3afe8f4cc394ae9450dc649cdc1512a431c5d4fc645d01ce4cc7be74e34a4161
+size 8785084
diff --git a/docker-cli-24.0.2_ce.tar.xz b/docker-cli-24.0.2_ce.tar.xz
deleted file mode 100644
index f98fb4e..0000000
--- a/docker-cli-24.0.2_ce.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:edb71f247bba95a0b395a8a6b67ecda8fec3cd393aea0553d22b9fc711870f6f
-size 3511708
diff --git a/docker-cli-24.0.4_ce.tar.xz b/docker-cli-24.0.4_ce.tar.xz
new file mode 100644
index 0000000..a9ec2dc
--- /dev/null
+++ b/docker-cli-24.0.4_ce.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dcce35801136750e1815a689911b7363f518abe58c6c04d0839d2622bd31802
+size 3514396
diff --git a/docker.changes b/docker.changes
index 9630441..a3c585a 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Jul 7 21:29:05 UTC 2023 - Aleksa Sarai
+
+- Update to Docker 24.0.4-ce. See upstream changelog online at
+ .
+
+-------------------------------------------------------------------
+Fri Jul 7 02:35:02 UTC 2023 - Aleksa Sarai
+
+- Update to Docker 24.0.3-ce. See upstream changelog online at
+ . bsc#1213120
+- Rebase patches:
+ * cli-0001-docs-include-required-tools-in-source-tree.patch
+
-------------------------------------------------------------------
Thu Jun 29 10:07:13 UTC 2023 - Danish Prakash
diff --git a/docker.spec b/docker.spec
index 31637a1..cb5e6a8 100644
--- a/docker.spec
+++ b/docker.spec
@@ -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.