Skip to content

Commit 00b0948

Browse files
authored
Keep publishing Docker labels in specific Docker Hub context (#126989) (#127305)
These labels are incompatible with the Docker Hub, but for now we need to keep them to override the labels coming from the base image.
1 parent d6bedc0 commit 00b0948

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

distribution/docker/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ for (final Architecture architecture : Architecture.values()) {
575575
}
576576
if(base == DockerBase.DEFAULT) {
577577
// Add additional docker hub specific context which we use solely for publishing to docker hub.
578-
// At the moment it only differs in not labels added that we need for openshift certification
578+
// At the moment it is exactly the same as the default context.
579579
addBuildDockerContextTask(architecture, base, 'DockerHubContext', "docker-hub-build-context")
580580
}
581581
}

distribution/docker/src/docker/Dockerfile.default

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,13 @@ LABEL org.label-schema.build-date="${build_date}" \\
139139
org.opencontainers.image.vendor="Elastic" \\
140140
org.opencontainers.image.version="${version}"
141141

142-
<% if (docker_context != 'docker-hub-build-context') { %>
143142
LABEL name="Elasticsearch" \\
144143
maintainer="[email protected]" \\
145144
vendor="Elastic" \\
146145
version="${version}" \\
147146
release="1" \\
148147
summary="Elasticsearch" \\
149148
description="You know, for search."
150-
<% } %>
151149

152150
RUN mkdir /licenses && ln LICENSE.txt /licenses/LICENSE
153151

0 commit comments

Comments
 (0)