docker: harmonize Docker labels and annotations

This commit is contained in:
Vincent Bernat
2025-08-16 23:27:07 +02:00
parent b672c08c62
commit f49b086018
4 changed files with 16 additions and 3 deletions

View File

@@ -251,6 +251,8 @@ jobs:
- uses: docker/setup-buildx-action@v3 - uses: docker/setup-buildx-action@v3
- uses: docker/metadata-action@v5 - uses: docker/metadata-action@v5
id: meta id: meta
env:
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
with: with:
images: | images: |
ghcr.io/${{ github.repository }} ghcr.io/${{ github.repository }}
@@ -260,6 +262,14 @@ jobs:
type=semver,pattern={{version}} type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}} type=semver,pattern={{major}}
labels: |
org.opencontainers.image.title=Akvorado
org.opencontainers.image.licenses=AGPL-3.0-only
annotations: |
manifest:org.opencontainers.image.title=Akvorado
manifest:org.opencontainers.image.licenses=AGPL-3.0-only
index:org.opencontainers.image.title=Akvorado
index:org.opencontainers.image.licenses=AGPL-3.0-only
- uses: docker/login-action@v3 - uses: docker/login-action@v3
with: with:
registry: ghcr.io registry: ghcr.io

View File

@@ -24,8 +24,9 @@ ARG VERSION
RUN make RUN make
FROM gcr.io/distroless/static:latest FROM gcr.io/distroless/static:latest
LABEL org.opencontainers.image.title="Akvorado"
LABEL org.opencontainers.image.description="Flow collector, enricher and visualizer"
LABEL org.opencontainers.image.source=https://github.com/akvorado/akvorado LABEL org.opencontainers.image.source=https://github.com/akvorado/akvorado
LABEL org.opencontainers.image.description="Akvorado: flow collector, enricher and visualizer"
LABEL org.opencontainers.image.licenses=AGPL-3.0-only LABEL org.opencontainers.image.licenses=AGPL-3.0-only
COPY --from=build-go /etc/mime.types /etc/mime.types COPY --from=build-go /etc/mime.types /etc/mime.types
COPY --from=build-go /build/bin/akvorado /usr/local/bin/akvorado COPY --from=build-go /build/bin/akvorado /usr/local/bin/akvorado

View File

@@ -1,6 +1,7 @@
FROM gcr.io/distroless/static:latest FROM gcr.io/distroless/static:latest
LABEL org.opencontainers.image.title="Akvorado"
LABEL org.opencontainers.image.description="Flow collector, enricher and visualizer (dev)"
LABEL org.opencontainers.image.source=https://github.com/akvorado/akvorado LABEL org.opencontainers.image.source=https://github.com/akvorado/akvorado
LABEL org.opencontainers.image.description="Akvorado: flow collector, enricher and visualizer (dev)"
LABEL org.opencontainers.image.licenses=AGPL-3.0-only LABEL org.opencontainers.image.licenses=AGPL-3.0-only
COPY bin/akvorado /usr/local/bin/ COPY bin/akvorado /usr/local/bin/
EXPOSE 8080 EXPOSE 8080

View File

@@ -11,8 +11,9 @@ RUN nix run ".#update" \
&& rm -rf /output/store/*-akvorado && rm -rf /output/store/*-akvorado
FROM gcr.io/distroless/static:latest FROM gcr.io/distroless/static:latest
LABEL org.opencontainers.image.title="Akvorado"
LABEL org.opencontainers.image.description="Flow collector, enricher and visualizer (nix)"
LABEL org.opencontainers.image.source=https://github.com/akvorado/akvorado LABEL org.opencontainers.image.source=https://github.com/akvorado/akvorado
LABEL org.opencontainers.image.description="Akvorado: flow collector, enricher and visualizer"
LABEL org.opencontainers.image.licenses=AGPL-3.0-only LABEL org.opencontainers.image.licenses=AGPL-3.0-only
COPY --from=build /output/store /nix/store COPY --from=build /output/store /nix/store
COPY --from=build /app/result/ /usr/local/ COPY --from=build /app/result/ /usr/local/