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

Fixed image labels for UBI image #308

Merged
merged 2 commits into from
Sep 28, 2023
Merged

Fixed image labels for UBI image #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60ada46
Added labels
maia-iyer Sep 27, 2023
9d5022a
Update Dockerfile.backend-container.ubi
maia-iyer Sep 28, 2023
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
19 changes: 18 additions & 1 deletion Dockerfile.backend-container
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,24 @@ ARG version
ARG github_sha
LABEL org.opencontainers.image.description="Tornjak backend ($version): https://github.com/spiffe/tornjak/releases/tag/$version" \
org.opencontainers.image.source="https://github.com/spiffe/tornjak" \
org.opencontainers.image.documentation="https://github.com/spiffe/tornjak/tree/main/docs"
org.opencontainers.image.documentation="https://github.com/spiffe/tornjak/tree/main/docs"

# Additional labels
LABEL architecture="amd64" \
build-date="" \
description="Tornjak Backend" \
io.k8s.description="Tornjak Backend" \
io.k8s.display-name="tornjak-backend" \
maintainer="" \
name="spiffe/tornjak-backend" \
release="$version" \
summary="Tornjak backend image" \
url="" \
vcs-ref="" \
vcs-type="" \
vendor="" \
version="$version"

# create env. variables with the build details
ENV VERSION=$version
ENV GITHUB_SHA=$github_sha
18 changes: 17 additions & 1 deletion Dockerfile.backend-container.ubi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,23 @@ ARG version
ARG github_sha
LABEL org.opencontainers.image.description="Tornjak backend ($version): https://github.com/spiffe/tornjak/releases/tag/$version" \
org.opencontainers.image.source="https://github.com/spiffe/tornjak" \
org.opencontainers.image.documentation="https://github.com/spiffe/tornjak/tree/main/docs"
org.opencontainers.image.documentation="https://github.com/spiffe/tornjak/tree/main/docs"
# replace UBI labels
LABEL architecture="amd64" \
build-date="" \
description="Tornjak Backend" \
io.k8s.description="Tornjak Backend" \
io.k8s.display-name="tornjak-backend" \
maintainer="" \
name="spiffe/tornjak-backend" \
release="$version" \
summary="Tornjak backend UBI image" \
url="" \
vcs-ref="" \
vcs-type="" \
vendor="" \
version="$version"

# create env. variables with the build details
ENV VERSION=$version
ENV GITHUB_SHA=$github_sha
17 changes: 16 additions & 1 deletion Dockerfile.frontend-container
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,22 @@ ARG version
ARG github_sha
LABEL org.opencontainers.image.description="Tornjak frontend ($version): https://github.com/spiffe/tornjak/releases/tag/$version" \
org.opencontainers.image.source="https://github.com/spiffe/tornjak" \
org.opencontainers.image.documentation="https://github.com/spiffe/tornjak/tree/main/docs"
org.opencontainers.image.documentation="https://github.com/spiffe/tornjak/tree/main/docs"
# additional labels
LABEL architecture="amd64" \
build-date="" \
description="Tornjak Frontend" \
io.k8s.description="Tornjak Frontend" \
io.k8s.display-name="tornjak-frontend" \
maintainer="" \
name="spiffe/tornjak-frontend" \
release="$version" \
summary="Tornjak frontend image" \
url="" \
vcs-ref="" \
vcs-type="" \
vendor="" \
version="$version"
# create env. variables with the build details
ENV VERSION=$version
ENV GITHUB_SHA=$github_sha
17 changes: 16 additions & 1 deletion Dockerfile.frontend-container.ubi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,22 @@ ARG version
ARG github_sha
LABEL org.opencontainers.image.description="Tornjak frontend ($version): https://github.com/spiffe/tornjak/releases/tag/$version" \
org.opencontainers.image.source="https://github.com/spiffe/tornjak" \
org.opencontainers.image.documentation="https://github.com/spiffe/tornjak/tree/main/docs"
org.opencontainers.image.documentation="https://github.com/spiffe/tornjak/tree/main/docs"
# replace UBI labels
LABEL architecture="amd64" \
build-date="" \
description="Tornjak Frontend" \
io.k8s.description="Tornjak Frontend" \
io.k8s.display-name="tornjak-frontend" \
maintainer="" \
name="spiffe/tornjak-frontend" \
release="$version" \
summary="Tornjak frontend UBI image" \
url="" \
vcs-ref="" \
vcs-type="" \
vendor="" \
version="$version"
# create env. variables with the build details
ENV VERSION=$version
ENV GITHUB_SHA=$github_sha