Expand image labels

Add the successor of the label.org labels opencontainer.org to the images

Author: WyriHaximus

Dockerfile-nts-alpine

@@ -2,16 +2,27 @@
 ARG PHP_VERSION=7.4
 ARG OS_VERSION=alpine3.11
 FROM php:$PHP_VERSION-cli-$OS_VERSION AS base
+ARG ARCH=amd64
+ARG PHP_VERSION=7.4
+ARG OS_VERSION=alpine3.11
+ENV PHP_VERSION=$PHP_VERSION
+ENV OS_VERSION=$OS_VERSION
 
-# Build-time metadata as defined at http://label-schema.org
-LABEL org.label-schema.name="wyrihaximusnet/php" \
-      org.label-schema.description="Opinionated ReactPHP optimised PHP Docker images" \
+# Build-time metadata as defined at http://label-schema.org and https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
+LABEL org.label-schema.title="Opinionated ReactPHP optimised PHP Docker images" \
+      org.label-schema.description="PHP Version: $PHP_VERSION Type: zts OS Version: $OS_VERSION" \
       org.label-schema.url="https://github.com/wyrihaximusnet/docker-php" \
       org.label-schema.vcs-url="https://github.com/wyrihaximusnet/docker-php" \
       org.label-schema.vendor="WyriHaximus.net" \
-      org.label-schema.schema-version="1.0"
-
-ARG ARCH=amd64
+      org.label-schema.schema-version="1.0" \
+      org.opencontainers.image.source="https://github.com/wyrihaximusnet/docker-php" \
+      org.opencontainers.image.url="https://github.com/wyrihaximusnet/docker-php" \
+      org.opencontainers.image.documentation="https://github.com/wyrihaximusnet/docker-php" \
+      org.opencontainers.image.title="Opinionated ReactPHP optimised PHP Docker images" \
+      org.opencontainers.image.description="PHP Version: $PHP_VERSION Type: zts OS Version: $OS_VERSION" \
+      org.opencontainers.image.licenses="MIT" \
+      org.opencontainers.image.base.name="php:$PHP_VERSION-cli-$OS_VERSION" \
+      org.opencontainers.image.vendor="WyriHaximus.net"
 
 RUN apk update \
     && apk upgrade \

Dockerfile-zts-alpine

@@ -2,16 +2,27 @@
 ARG PHP_VERSION=7.4
 ARG OS_VERSION=alpine3.11
 FROM php:$PHP_VERSION-zts-$OS_VERSION AS base
+ARG ARCH=amd64
+ARG PHP_VERSION=7.4
+ARG OS_VERSION=alpine3.11
+ENV PHP_VERSION=$PHP_VERSION
+ENV OS_VERSION=$OS_VERSION
 
-# Build-time metadata as defined at http://label-schema.org
-LABEL org.label-schema.name="wyrihaximusnet/php" \
-      org.label-schema.description="Opinionated ReactPHP optimised PHP Docker images" \
+# Build-time metadata as defined at http://label-schema.org and https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
+LABEL org.label-schema.title="Opinionated ReactPHP optimised PHP Docker images" \
+      org.label-schema.description="PHP Version: $PHP_VERSION Type: zts OS Version: $OS_VERSION" \
       org.label-schema.url="https://github.com/wyrihaximusnet/docker-php" \
       org.label-schema.vcs-url="https://github.com/wyrihaximusnet/docker-php" \
       org.label-schema.vendor="WyriHaximus.net" \
-      org.label-schema.schema-version="1.0"
-
-ARG ARCH=amd64
+      org.label-schema.schema-version="1.0" \
+      org.opencontainers.image.source="https://github.com/wyrihaximusnet/docker-php" \
+      org.opencontainers.image.url="https://github.com/wyrihaximusnet/docker-php" \
+      org.opencontainers.image.documentation="https://github.com/wyrihaximusnet/docker-php" \
+      org.opencontainers.image.title="Opinionated ReactPHP optimised PHP Docker images" \
+      org.opencontainers.image.description="PHP Version: $PHP_VERSION Type: zts OS Version: $OS_VERSION" \
+      org.opencontainers.image.licenses="MIT" \
+      org.opencontainers.image.base.name="php:$PHP_VERSION-zts-$OS_VERSION" \
+      org.opencontainers.image.vendor="WyriHaximus.net"
 
 RUN apk update \
     && apk upgrade \

build-php.sh

@@ -45,6 +45,17 @@ docker pull "php:${IMAGE_TAG}"
 
 for buildTarget in "${target[@]}"
 do
-  docker build --build-arg ARCH=${TARGET_ARCH} --build-arg PHP_VERSION=${VERSION_PHP} --build-arg OS_VERSION=${VERSION_OS} --platform ${TARGET_ARCH} --label org.label-schema.build-date=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --label org.label-schema.vcs-ref=`git rev-parse --short HEAD` -t "${WYRIHAXIMUSNET_TAG}${buildTarget}-${TARGET_ARCH}" --target="${DST_IMAGE}${buildTarget}" -f "Dockerfile-${DST_IMAGE}-${OS}" .
+  docker build --no-cache \
+    --build-arg ARCH=${TARGET_ARCH} \
+    --build-arg PHP_VERSION=${VERSION_PHP} \
+    --build-arg OS_VERSION=${VERSION_OS} \
+    --platform ${TARGET_ARCH} \
+    --label org.label-schema.build-date=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+    --label org.opencontainers.image.created=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+    --label org.label-schema.vcs-ref=`git rev-parse --short HEAD` \
+    --label org.opencontainers.image.revision-ref=`git rev-parse --short HEAD` \
+    -t "${WYRIHAXIMUSNET_TAG}${buildTarget}-${TARGET_ARCH}" \
+    --target="${DST_IMAGE}${buildTarget}" \
+    -f "Dockerfile-${DST_IMAGE}-${OS}" .
   echo "${WYRIHAXIMUSNET_TAG}${buildTarget}-${TARGET_ARCH}" >> "$TAG_FILE"
 done