Skip to content

ironbank: rename ubi9 to ubi image #37153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
v1v merged 2 commits into from
Nov 27, 2023
Merged

ironbank: rename ubi9 to ubi image #37153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
608d347
ironbank: rename ubi9 to ubi image
v1v Nov 20, 2023
2a78936
Merge branch 'main' into feature/replace-ubi9-and-use-ubi
v1v Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/packaging.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ def linuxPlatforms() {
def pushCIDockerImages(Map args = [:]) {
def arch = args.get('arch', 'amd64')
catchError(buildResult: 'UNSTABLE', message: 'Unable to push Docker images', stageResult: 'FAILURE') {
def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi9' : 'beats' ]
def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi' : 'beats' ]
if (env?.BEATS_FOLDER?.endsWith('auditbeat')) {
tagAndPush(beatName: 'auditbeat', arch: arch, variants: defaultVariants)
} else if (env?.BEATS_FOLDER?.endsWith('filebeat')) {
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ def pushCIDockerImages(Map args = [:]) {
def arch = args.get('arch', 'amd64')
def beatsFolder = args.beatsFolder
catchError(buildResult: 'UNSTABLE', message: 'Unable to push Docker images', stageResult: 'FAILURE') {
def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi9' : 'beats' ]
def defaultVariants = [ '' : 'beats', '-oss' : 'beats', '-ubi' : 'beats' ]
if (beatsFolder.endsWith('auditbeat')) {
tagAndPush(beatName: 'auditbeat', arch: arch, variants: defaultVariants)
} else if (beatsFolder.endsWith('filebeat')) {
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/packaging/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ shared:

- &docker_ubi_spec
extra_vars:
image_name: '{{.BeatName}}-ubi9'
image_name: '{{.BeatName}}-ubi'
from: 'docker.elastic.co/ubi9/ubi-minimal'

- &docker_arm_ubi_spec
extra_vars:
image_name: '{{.BeatName}}-ubi9'
image_name: '{{.BeatName}}-ubi'
from: 'registry.access.redhat.com/ubi9/ubi-minimal:9.3'

- &elastic_docker_spec
Expand Down