Skip to content

Commit

Permalink
change base image to ubi 9.2 (#36797) (#36801)
Browse files Browse the repository at this point in the history 
Co-authored-by: julienlind <vincent.lind@elastic.co>
(cherry picked from commit 2393576)

# Conflicts:
#	dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
#	dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
#	dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
#	dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml
#	dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile
#	dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml
#	dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
#	dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml
#	dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
#	dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml

Co-authored-by: Julien Lind <julien.lind@elastic.co>
  • Loading branch information
@mergify @jlind23
mergify[bot] and jlind23 authored Oct 9, 2023
1 parent aae1fa2 commit 0789b4f
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 10 deletions.
4 changes: 3 additions & 1 deletion dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
################################################################################
ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.7

ARG BASE_TAG=9.2


FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tags:
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.7"
BASE_TAG: "9.2"
ELASTIC_STACK: "{{ beat_version }}"
ELASTIC_PRODUCT: "auditbeat"

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
################################################################################
ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.7
ARG BASE_TAG=9.2

FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tags:
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.7"
BASE_TAG: "9.2"
ELASTIC_STACK: "{{ beat_version }}"
ELASTIC_PRODUCT: "filebeat"

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
################################################################################
ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.7
ARG BASE_TAG=9.2

FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as prep_files

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tags:
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.7"
BASE_TAG: "9.2"
ELASTIC_STACK: "{{ beat_version }}"
ELASTIC_PRODUCT: "heartbeat"

Expand Down
3 changes: 2 additions & 1 deletion dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
################################################################################
ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.7
ARG BASE_TAG=9.2


FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tags:
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.7"
BASE_TAG: "9.2"
ELASTIC_STACK: "{{ beat_version }}"
ELASTIC_PRODUCT: "metricbeat"

Expand Down
3 changes: 2 additions & 1 deletion dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
################################################################################
ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.7
ARG BASE_TAG=9.2


FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as builder

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tags:
# Build args passed to Dockerfile ARGs
args:
BASE_IMAGE: "redhat/ubi/ubi8"
BASE_TAG: "8.7"
BASE_TAG: "9.2"
ELASTIC_STACK: "{{ beat_version }}"
ELASTIC_PRODUCT: "packetbeat"

Expand Down

0 comments on commit 0789b4f

Please sign in to comment.