From c474ecf0fd76522b75592f87ec4de98bd4744c16 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Thu, 12 Dec 2024 05:03:30 +1100
Subject: [PATCH] [8.x] fix(NA): include ca-certificates package for wolfi
 based images (#203849) (#203864)

# Backport

This will backport the following commits from `main` to `8.x`:
- [fix(NA): include ca-certificates package for wolfi based images
(#203849)](https://github.com/elastic/kibana/pull/203849)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Tiago
Costa","email":"tiago.costa@elastic.co"},"sourceCommit":{"committedDate":"2024-12-11T17:54:45Z","message":"fix(NA):
include ca-certificates package for wolfi based images (#203849)\n\nIn
the transition to wolfi based images on cloud we forgot to add
the\r\n`ca-certificates` package which seems to be used by customers
in\r\nair-gapped networks who rely on that utility to inject
their\r\nenterprise/agency CA.\r\n\r\nThis PR re-adds this dependency
install to
wolfi.","sha":"d92229985b07438c81a85f8917f1ce2d49bd1df4","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Operations","release_note:skip","v9.0.0","ci:cloud-deploy","backport:version","v8.18.0","v8.16.2","v8.17.1"],"title":"fix(NA):
include ca-certificates package for wolfi based
images","number":203849,"url":"https://github.com/elastic/kibana/pull/203849","mergeCommit":{"message":"fix(NA):
include ca-certificates package for wolfi based images (#203849)\n\nIn
the transition to wolfi based images on cloud we forgot to add
the\r\n`ca-certificates` package which seems to be used by customers
in\r\nair-gapped networks who rely on that utility to inject
their\r\nenterprise/agency CA.\r\n\r\nThis PR re-adds this dependency
install to
wolfi.","sha":"d92229985b07438c81a85f8917f1ce2d49bd1df4"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16","8.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/203849","number":203849,"mergeCommit":{"message":"fix(NA):
include ca-certificates package for wolfi based images (#203849)\n\nIn
the transition to wolfi based images on cloud we forgot to add
the\r\n`ca-certificates` package which seems to be used by customers
in\r\nair-gapped networks who rely on that utility to inject
their\r\nenterprise/agency CA.\r\n\r\nThis PR re-adds this dependency
install to
wolfi.","sha":"d92229985b07438c81a85f8917f1ce2d49bd1df4"}},{"branch":"8.x","label":"v8.18.0","branchLabelMappingKey":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.2","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Tiago Costa <tiago.costa@elastic.co>
---
 .../os_packages/docker_generator/templates/base/Dockerfile      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
index 94d604d726562..e868cb73cb8db 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
@@ -134,7 +134,7 @@ RUN for iter in {1..10}; do \
     (exit $exit_code)
 {{/ubuntu}}
 {{#wolfi}}
-RUN apk --no-cache add bash curl fontconfig libstdc++ libnss findutils shadow
+RUN apk --no-cache add bash curl fontconfig libstdc++ libnss findutils shadow ca-certificates
 {{/wolfi}}
 
 # Bring in Kibana from the initial stage.