[build] Rename ubi9 image to ubi (#171424)

Future ubi image names will be version agnostic.  Removal of ubi8 TBD.

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Jon 2023-11-29 11:50:22 -06:00 committed by GitHub
parent cbfc49202c
commit 0796976a27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View file

@ -61,7 +61,7 @@ steps:
- exit_status: '*'
limit: 1
- command: KIBANA_DOCKER_CONTEXT=ubi9 .buildkite/scripts/steps/artifacts/docker_context.sh
- command: KIBANA_DOCKER_CONTEXT=ubi .buildkite/scripts/steps/artifacts/docker_context.sh
label: 'Docker Context Verification'
agents:
queue: n2-2

View file

@ -26,8 +26,9 @@ case $KIBANA_DOCKER_CONTEXT in
ubi8)
DOCKER_CONTEXT_FILE="kibana-ubi8-$FULL_VERSION-docker-build-context.tar.gz"
;;
ubi9)
DOCKER_CONTEXT_FILE="kibana-ubi9-$FULL_VERSION-docker-build-context.tar.gz"
ubi)
# Currently ubi9. After ubi8 we're moving to a version agnostic filename
DOCKER_CONTEXT_FILE="kibana-ubi-$FULL_VERSION-docker-build-context.tar.gz"
;;
ironbank)
DOCKER_CONTEXT_FILE="kibana-ironbank-$FULL_VERSION-docker-build-context.tar.gz"

View file

@ -45,7 +45,7 @@ export async function runDockerGenerator(
let imageFlavor = '';
if (flags.baseImage === 'ubi8') imageFlavor += `-ubi8`;
if (flags.baseImage === 'ubi9') imageFlavor += `-ubi9`;
if (flags.baseImage === 'ubi9') imageFlavor += `-ubi`;
if (flags.ironbank) imageFlavor += '-ironbank';
if (flags.cloud) imageFlavor += '-cloud';
if (flags.serverless) imageFlavor += '-serverless';