Add more Docker Image Metadata

package-health · Apr 1, 2022 · 4ca9dc6 · 4ca9dc6
1 parent c19a6b2
commit 4ca9dc6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml
@@ -43,6 +43,8 @@ jobs:
         with:
           push: false
           load: true
+          build-args:
+            "VERSION=${{ steps.prepare-build.outputs.environment }}-${{ steps.prepare-build.outputs.short }}"
           tags: package-health/nginx:${{ steps.prepare-build.outputs.environment }}-${{ steps.prepare-build.outputs.short }}
           file: ./docker/nginx.Dockerfile
           context: .
@@ -54,6 +56,8 @@ jobs:
         with:
           push: false
           load: true
+          build-args:
+            "VERSION=${{ steps.prepare-build.outputs.environment }}-${{ steps.prepare-build.outputs.short }}"
           tags: package-health/php-fpm:${{ steps.prepare-build.outputs.environment }}-${{ steps.prepare-build.outputs.short }}
           file: ./docker/php.Dockerfile
           target: fpm
@@ -66,6 +70,8 @@ jobs:
         with:
           push: false
           load: true
+          build-args:
+            "VERSION=${{ steps.prepare-build.outputs.environment }}-${{ steps.prepare-build.outputs.short }}"
           tags: package-health/php-cli:${{ steps.prepare-build.outputs.environment }}-${{ steps.prepare-build.outputs.short }}
           file: ./docker/php.Dockerfile
           target: cli

diff --git a/docker/nginx.Dockerfile b/docker/nginx.Dockerfile
@@ -27,9 +27,13 @@ HEALTHCHECK --interval=1m30s --timeout=10s --retries=3 --start-period=40s CMD cu
 #============================================
 # Metadata
 #============================================
-LABEL org.opencontainers.image.authors="[email protected]" \
+ARG VERSION=latest
+LABEL maintainer="Flavio Heleno <[email protected]>" \
+      org.opencontainers.image.authors="[email protected]" \
       org.opencontainers.image.title="PHP-Package-Health-NGINX" \
       org.opencontainers.image.url="https://github.com/package-health/php" \
-      org.opencontainers.image.vendor="Package Health"
+      org.opencontainers.image.vendor="Package Health" \
+      org.opencontainers.image.version="${VERSION}" \
+      org.opencontainers.image.base.name="ghcr.io/package-health/pph-nginx:${VERSION}"
 
 WORKDIR /usr/share/nginx/html
diff --git a/docker/php.Dockerfile b/docker/php.Dockerfile
@@ -135,10 +135,14 @@ WORKDIR /var/www/html/bin
 #============================================
 # Metadata
 #============================================
-LABEL org.opencontainers.image.authors="[email protected]" \
+ARG VERSION=latest
+LABEL maintainer="Flavio Heleno <[email protected]>" \
+      org.opencontainers.image.authors="[email protected]" \
       org.opencontainers.image.title="PHP-Package-Health: PHP-CLI" \
       org.opencontainers.image.url="https://github.com/package-health/php" \
-      org.opencontainers.image.vendor="Package Health"
+      org.opencontainers.image.vendor="Package Health" \
+      org.opencontainers.image.version="${VERSION}" \
+      org.opencontainers.image.base.name="ghcr.io/package-health/pph-php-cli:${VERSION}"
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["php"]
@@ -212,10 +216,14 @@ HEALTHCHECK --interval=1m30s --timeout=10s --retries=3 --start-period=40s CMD ph
 #============================================
 # Metadata
 #============================================
-LABEL org.opencontainers.image.authors="[email protected]" \
+ARG VERSION=latest
+LABEL maintainer="Flavio Heleno <[email protected]>" \
+      org.opencontainers.image.authors="[email protected]" \
       org.opencontainers.image.title="PHP-Package-Health: PHP-FPM" \
       org.opencontainers.image.url="https://github.com/package-health/php" \
-      org.opencontainers.image.vendor="Package Health"
+      org.opencontainers.image.vendor="Package Health" \
+      org.opencontainers.image.version="${VERSION}" \
+      org.opencontainers.image.base.name="ghcr.io/package-health/pph-php-fpm:${VERSION}"
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 CMD ["php-fpm"]