Skip to content
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

Add Labels to Docker Images #73

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add Labels to Docker Images #73

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ee5524
Add Labels to Docker Images
jabdoa2 Aug 7, 2024
e5ce08f
Update Dockerfile
jabdoa2 Aug 8, 2024
b0cdcce
Update Dockerfile
jabdoa2 Aug 8, 2024
4c8aa1c
Add image title and vendor to image in Dockerfile
jabdoa2 Aug 8, 2024
41b4ea3
Add link to repo containing the Dockerfile
jabdoa2 Aug 8, 2024
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
4 changes: 4 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ RUN ["chmod", "-R", "u=rwX,go=rX", "/rootfs"]

FROM scratch

LABEL org.opencontainers.image.documentation='https://icinga.com/docs/icinga-db/latest/doc/01-About/' \
jabdoa2 marked this conversation as resolved.
Show resolved Hide resolved
org.opencontainers.image.source='https://github.com/Icinga/icingadb' \
jabdoa2 marked this conversation as resolved.
Show resolved Hide resolved
org.opencontainers.image.licenses='GPL-2.0+'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the docs, .licenses should be an SPDX License Expression.

Suggested change
org.opencontainers.image.licenses='GPL-2.0+'
org.opencontainers.image.licenses='GPL-2.0-or-later'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope.

Suggested change
org.opencontainers.image.licenses='GPL-2.0+'
org.opencontainers.image.licenses='GPL-2.0-only'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure? The Dockerfile has GPLv2+ in its header.

docker-icingadb/Dockerfile

Line 1 in a362254

# Icinga DB Docker image | (c) 2020 Icinga GmbH | GPLv2+

Copy link
Author

@jabdoa2 jabdoa2 Aug 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The LICENSE file states either version 2 of the License, or (at your option) any later version. In my opinion that would be the final authorative legal source and indicates GPL-2.0+/GPL-2.0-or-later

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's skip the question how it is now directly to how should it be. GPLv2 or v2+? @lippserd

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also drop the label for now. It is not super important to tag that to the image (at least for us). If you want I can remove it.


jabdoa2 marked this conversation as resolved.
Show resolved Hide resolved
COPY --from=base /rootfs/ /
COPY --from=base --chown=icingadb:icingadb /empty /etc/icingadb
COPY --from=entrypoint /entrypoint/entrypoint /entrypoint
Expand Down