From b4a19dae6e8c8048fda7f9f12de9f6a2ece874c1 Mon Sep 17 00:00:00 2001 From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Date: Wed, 6 Nov 2024 06:41:54 +1100 Subject: [PATCH] [8.x] Update docker.elastic.co/wolfi/chainguard-base:latest Docker digest to 26caa6b (main) (#198639) (#199037) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Backport This will backport the following commits from `main` to `8.x`: - [Update docker.elastic.co/wolfi/chainguard-base:latest Docker digest to 26caa6b (main) (#198639)](https://github.com/elastic/kibana/pull/198639) ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) If you want to rebase/retry this PR, check\r\nthis box\r\n\r\n---\r\n\r\nThis PR has been generated by [Renovate\r\nBot](https://togithub.com/renovatebot/renovate).\r\n\r\n\r\n\r\nCo-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>","sha":"b71efcfe7c6c313aab3b85d7ad157d049c9bab7d","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","v9.0.0","backport:prev-minor","ci:project-deploy-elasticsearch","v8.16.0"],"title":"Update docker.elastic.co/wolfi/chainguard-base:latest Docker digest to 26caa6b (main)","number":198639,"url":"https://github.com/elastic/kibana/pull/198639","mergeCommit":{"message":"Update docker.elastic.co/wolfi/chainguard-base:latest Docker digest to 26caa6b (main) (#198639)\n\nThis PR contains the following updates:\r\n\r\n| Package | Update | Change |\r\n|---|---|---|\r\n| docker.elastic.co/wolfi/chainguard-base | digest | `7082adc` ->\r\n`26caa6b` |\r\n\r\n---\r\n\r\n### Configuration\r\n\r\nšŸ“… **Schedule**: Branch creation - At any time (no schedule defined),\r\nAutomerge - At any time (no schedule defined).\r\n\r\nšŸš¦ **Automerge**: Disabled by config. Please merge this manually once you\r\nare satisfied.\r\n\r\nā™» **Rebasing**: Whenever PR becomes conflicted, or you tick the\r\nrebase/retry checkbox.\r\n\r\nšŸ”• **Ignore**: Close this PR and you won't be reminded about this update\r\nagain.\r\n\r\n---\r\n\r\n- [ ] If you want to rebase/retry this PR, check\r\nthis box\r\n\r\n---\r\n\r\nThis PR has been generated by [Renovate\r\nBot](https://togithub.com/renovatebot/renovate).\r\n\r\n\r\n\r\nCo-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>","sha":"b71efcfe7c6c313aab3b85d7ad157d049c9bab7d"}},"sourceBranch":"main","suggestedTargetBranches":["8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/198639","number":198639,"mergeCommit":{"message":"Update docker.elastic.co/wolfi/chainguard-base:latest Docker digest to 26caa6b (main) (#198639)\n\nThis PR contains the following updates:\r\n\r\n| Package | Update | Change |\r\n|---|---|---|\r\n| docker.elastic.co/wolfi/chainguard-base | digest | `7082adc` ->\r\n`26caa6b` |\r\n\r\n---\r\n\r\n### Configuration\r\n\r\nšŸ“… **Schedule**: Branch creation - At any time (no schedule defined),\r\nAutomerge - At any time (no schedule defined).\r\n\r\nšŸš¦ **Automerge**: Disabled by config. Please merge this manually once you\r\nare satisfied.\r\n\r\nā™» **Rebasing**: Whenever PR becomes conflicted, or you tick the\r\nrebase/retry checkbox.\r\n\r\nšŸ”• **Ignore**: Close this PR and you won't be reminded about this update\r\nagain.\r\n\r\n---\r\n\r\n- [ ] If you want to rebase/retry this PR, check\r\nthis box\r\n\r\n---\r\n\r\nThis PR has been generated by [Renovate\r\nBot](https://togithub.com/renovatebot/renovate).\r\n\r\n\r\n\r\nCo-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>","sha":"b71efcfe7c6c313aab3b85d7ad157d049c9bab7d"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT--> Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com> --- src/dev/build/tasks/os_packages/docker_generator/run.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts index 85cd6d7458ba9..7a64ada1bfff9 100644 --- a/src/dev/build/tasks/os_packages/docker_generator/run.ts +++ b/src/dev/build/tasks/os_packages/docker_generator/run.ts @@ -51,7 +51,7 @@ export async function runDockerGenerator( */ if (flags.baseImage === 'wolfi') baseImageName = - 'docker.elastic.co/wolfi/chainguard-base:latest@sha256:7082adcc2c4380be273ab5b80c4a762b4f17279c13c6fc8f87a60190aee2e2cd'; + 'docker.elastic.co/wolfi/chainguard-base:latest@sha256:26caa6beaee2bbf739a82e91a35173892dfe888d0a744b9e46cdc19a90d8656f'; let imageFlavor = ''; if (flags.baseImage === 'ubi') imageFlavor += `-ubi`;