Skip to content

Commit 7f58faa

Browse files
authored
Restore maintainer label to container images (#6512)
If we don't set this label, it's inherited from the base image. For UBI images, the value is "Red Hat Inc", and Red Hat's preflight validation complains about it.
1 parent 6f46174 commit 7f58faa

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: bug-fix
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Restore `maintainer` label for container images
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
#pr: https://github.com/owner/repo/1234
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl

+3
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ LABEL \
110110
org.opencontainers.image.vendor="{{ .BeatVendor }}" \
111111
org.opencontainers.image.authors="infra@elastic.co" \
112112
name="{{ .BeatName }}" \
113+
# The maintainer label is deprecated, but RedHat still checks for it in their preflight validation. If we don't set
114+
# it here, we inherit it from the base image, and fail said validation.
115+
maintainer="infra@elastic.co" \
113116
vendor="{{ .BeatVendor }}" \
114117
version="{{ beat_version }}{{if .Snapshot}}-SNAPSHOT{{end}}" \
115118
release="1" \

0 commit comments

Comments
 (0)