github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[7.17] [ironbank] Upgrade to ubi 9.4 (#182738) (#191126)

Browse source 
# Backport

This will backport the following commits from `main` to `7.17`:
- [[ironbank] Upgrade to ubi 9.4
(#182738)](https://github.com/elastic/kibana/pull/182738)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT
[{"author":{"name":"Jon","email":"jon@elastic.co"},"sourceCommit":{"committedDate":"2024-05-06T19:51:27Z","message":"[ironbank]
Upgrade to ubi 9.4
(#182738)","sha":"56a22661dd450f841c0aee0edeabb1005f0382d7","branchLabelMapping":{"^v8.15.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","backport:prev-minor","v8.14.0","v8.15.0"],"number":182738,"url":"https://github.com/elastic/kibana/pull/182738","mergeCommit":{"message":"[ironbank]
Upgrade to ubi 9.4
(#182738)","sha":"56a22661dd450f841c0aee0edeabb1005f0382d7"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"8.14","label":"v8.14.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/182750","number":182750,"state":"MERGED","mergeCommit":{"sha":"df9a04509b5aaae80942441c732aa2366c7aea04","message":"[8.14]
[ironbank] Upgrade to ubi 9.4 (#182738) (#182750)\n\n# Backport\n\nThis
will backport the following commits from `main` to `8.14`:\n-
[[ironbank] Upgrade to ubi
9.4\n(#182738)](https://github.com/elastic/kibana/pull/182738)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT\n[{\"author\":{\"name\":\"Jon\",\"email\":\"jon@elastic.co\"},\"sourceCommit\":{\"committedDate\":\"2024-05-06T19:51:27Z\",\"message\":\"[ironbank]\nUpgrade
to ubi
9.4\n(#182738)\",\"sha\":\"56a22661dd450f841c0aee0edeabb1005f0382d7\",\"branchLabelMapping\":{\"^v8.15.0$\":\"main\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:Operations\",\"release_note:skip\",\"backport:prev-minor\",\"v8.15.0\"],\"title\":\"[ironbank]\nUpgrade
to
ubi\n9.4\",\"number\":182738,\"url\":\"https://github.com/elastic/kibana/pull/182738\",\"mergeCommit\":{\"message\":\"[ironbank]\nUpgrade
to ubi
9.4\n(#182738)\",\"sha\":\"56a22661dd450f841c0aee0edeabb1005f0382d7\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v8.15.0\",\"branchLabelMappingKey\":\"^v8.15.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/182738\",\"number\":182738,\"mergeCommit\":{\"message\":\"[ironbank]\nUpgrade
to ubi
9.4\n(#182738)\",\"sha\":\"56a22661dd450f841c0aee0edeabb1005f0382d7\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jon
<jon@elastic.co>"}},{"branch":"main","label":"v8.15.0","labelRegex":"^v8.15.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/182738","number":182738,"mergeCommit":{"message":"[ironbank]
Upgrade to ubi 9.4
(#182738)","sha":"56a22661dd450f841c0aee0edeabb1005f0382d7"}}]}]
BACKPORT-->

Co-authored-by: Jon <jon@elastic.co>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This commit is contained in:
Larry Gregory 2024-08-22 17:32:40 -04:00 • committed by GitHub
parent b6caa06758
commit 822a8412c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/Dockerfile
View file

@ -4,7 +4,7 @@
################################################################################
ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi9
ARG BASE_TAG=9.3
ARG BASE_TAG=9.4
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files

2
src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
View file

@ -14,7 +14,7 @@ tags:
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: 'redhat/ubi/ubi9'
BASE_TAG: '9.3'
BASE_TAG: '9.4'
# Docker image labels
labels: