Skip to content

Keep publishing Docker labels in specific Docker Hub context #126989

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
merged 4 commits into from
Apr 24, 2025
Merged

Keep publishing Docker labels in specific Docker Hub context #126989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af2921d
Keep publishing Docker labels in specific Docker Hub context
jozala Apr 17, 2025
93960c9
Merge branch 'main' into docker-hub-images-fix
jozala Apr 18, 2025
477cb40
Merge branch 'main' into docker-hub-images-fix
jozala Apr 22, 2025
75f72dc
Merge branch 'main' into docker-hub-images-fix
jozala Apr 23, 2025
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 distribution/docker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ for (final Architecture architecture : Architecture.values()) {
}
if(base == DockerBase.DEFAULT) {
// Add additional docker hub specific context which we use solely for publishing to docker hub.
// At the moment it only differs in not labels added that we need for openshift certification
// At the moment it is exactly the same as the default context.
addBuildDockerContextTask(architecture, base, 'DockerHubContext', "docker-hub-build-context")
}
}
Expand Down
2 changes: 0 additions & 2 deletions distribution/docker/src/docker/Dockerfile.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,13 @@ LABEL org.label-schema.build-date="${build_date}" \\
org.opencontainers.image.vendor="Elastic" \\
org.opencontainers.image.version="${version}"

<% if (docker_context != 'docker-hub-build-context') { %>
LABEL name="Elasticsearch" \\
maintainer="infra@elastic.co" \\
vendor="Elastic" \\
version="${version}" \\
release="1" \\
summary="Elasticsearch" \\
description="You know, for search."
<% } %>

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

Expand Down