Fixed image labels for UBI image (#308)

* Added labels Signed-off-by: Maia Iyer <maia.raj.iyer@gmail.com> * Update Dockerfile.backend-container.ubi Signed-off-by: Maia Iyer <maia.raj.iyer@gmail.com> Co-authored-by: Mariusz Sabath <mrsabath@gmail.com> --------- Signed-off-by: Maia Iyer <maia.raj.iyer@gmail.com> Co-authored-by: Mariusz Sabath <mrsabath@gmail.com>
spiffe · Mar 20, 2024 · 7f874da · 7f874da
1 parent 1309c47
commit 7f874da
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 4 deletions.
diff --git a/Dockerfile.backend-container b/Dockerfile.backend-container
@@ -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
diff --git a/Dockerfile.backend-container.ubi b/Dockerfile.backend-container.ubi
@@ -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
diff --git a/Dockerfile.frontend-container b/Dockerfile.frontend-container
@@ -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
diff --git a/Dockerfile.frontend-container.ubi b/Dockerfile.frontend-container.ubi
@@ -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