From 2b37ab767511075c9f619bd1a1defc1c78f77a5c Mon Sep 17 00:00:00 2001
From: Andrei Stefan <astefan@users.noreply.github.com>
Date: Tue, 17 Dec 2024 13:01:32 +0200
Subject: [PATCH 1/2] Adjust the test based on the year change (#118827)

---
 .../plugin/sql/qa/server/src/main/resources/docs/docs.csv-spec  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugin/sql/qa/server/src/main/resources/docs/docs.csv-spec b/x-pack/plugin/sql/qa/server/src/main/resources/docs/docs.csv-spec
index 60e81be43cc96..2fa82c05cc1aa 100644
--- a/x-pack/plugin/sql/qa/server/src/main/resources/docs/docs.csv-spec
+++ b/x-pack/plugin/sql/qa/server/src/main/resources/docs/docs.csv-spec
@@ -3353,7 +3353,7 @@ Alejandro
 Amabile
 Anoosh
 Basil
-Bojan
+Brendon
 // end::filterToday
 ;
 

From ca58882352e3689b5115bbf709e166ca8ba59bdc Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Tue, 17 Dec 2024 14:12:02 +0100
Subject: [PATCH 2/2] Add wolfi documentation from 8.16 branch (#118835)
 (#118839)

port from https://github.com/elastic/elasticsearch/pull/118684
---
 docs/Versions.asciidoc                       | 1 +
 docs/reference/setup/install/docker.asciidoc | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
index b65b974cd6b69..e19db10783988 100644
--- a/docs/Versions.asciidoc
+++ b/docs/Versions.asciidoc
@@ -9,6 +9,7 @@ include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
 :docker-repo:       docker.elastic.co/elasticsearch/elasticsearch
 :docker-image:      {docker-repo}:{version}
+:docker-wolfi-image: {docker-repo}-wolfi:{version}
 :kib-docker-repo:   docker.elastic.co/kibana/kibana
 :kib-docker-image:  {kib-docker-repo}:{version}
 :plugin_url:      https://artifacts.elastic.co/downloads/elasticsearch-plugins
diff --git a/docs/reference/setup/install/docker.asciidoc b/docs/reference/setup/install/docker.asciidoc
index 8694d7f5b46c6..86a0e567f6eec 100644
--- a/docs/reference/setup/install/docker.asciidoc
+++ b/docs/reference/setup/install/docker.asciidoc
@@ -55,6 +55,12 @@ docker pull {docker-image}
 // REVIEWED[DEC.10.24]
 --
 
+Alternatevely, you can use the Wolfi based image. Using Wolfi based images requires Docker version 20.10.10 or superior.
+[source,sh,subs="attributes"]
+----
+docker pull {docker-wolfi-image}
+----
+
 . Optional: Install
 https://docs.sigstore.dev/cosign/system_config/installation/[Cosign] for your
 environment. Then use Cosign to verify the {es} image's signature.