From b2a9e7842c13153565fd4c53db807c8577b9267b Mon Sep 17 00:00:00 2001 From: Rylie Pavlik Date: Fri, 12 Apr 2024 17:20:56 -0500 Subject: [PATCH 1/4] Install hexapdf for OpenXR --- openxr.Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openxr.Dockerfile b/openxr.Dockerfile index b761e61..146bf7d 100644 --- a/openxr.Dockerfile +++ b/openxr.Dockerfile @@ -49,11 +49,10 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* # Basic gems -RUN gem install rake asciidoctor coderay json-schema rghost +RUN gem install rake asciidoctor coderay json-schema rghost rouge hexapdf # Newer versions break our index customizer, haven't figured out the fix yet. RUN gem install asciidoctor-pdf --version 1.6.2 # RUN MATHEMATICAL_SKIP_STRDUP=1 gem install asciidoctor-mathematical -RUN gem install rouge # Basic pip packages RUN python3 -m pip install --break-system-packages --no-cache-dir codespell pypdf2 pdoc3 reuse jinja2-cli From 7262bf2032d1ebc6d1d67bb26ac1d37e14368508 Mon Sep 17 00:00:00 2001 From: Rylie Pavlik Date: Fri, 12 Apr 2024 17:38:39 -0500 Subject: [PATCH 2/4] Metadata for OpenXR images --- openxr-android.Dockerfile | 5 ++++- openxr-pregenerated-sdk.Dockerfile | 5 ++++- openxr-sdk.Dockerfile | 5 ++++- openxr.Dockerfile | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/openxr-android.Dockerfile b/openxr-android.Dockerfile index 9742b2c..699f31f 100644 --- a/openxr-android.Dockerfile +++ b/openxr-android.Dockerfile @@ -3,7 +3,10 @@ # SPDX-License-Identifier: Apache-2.0 FROM debian:bookworm -LABEL maintainer="Rylie Pavlik " + +LABEL maintainer="Rylie Pavlik " \ + org.opencontainers.image.authors="Rylie Pavlik " \ + org.opencontainers.image.source=https://github.com/KhronosGroup/DockerContainers/blob/main/openxr-android.Dockerfile ENV LANG C.UTF-8 diff --git a/openxr-pregenerated-sdk.Dockerfile b/openxr-pregenerated-sdk.Dockerfile index c45b657..63a923d 100644 --- a/openxr-pregenerated-sdk.Dockerfile +++ b/openxr-pregenerated-sdk.Dockerfile @@ -18,7 +18,10 @@ # Intended for CI use. FROM ubuntu:20.04 -LABEL maintainer="Rylie Pavlik " + +LABEL maintainer="Rylie Pavlik " \ + org.opencontainers.image.authors="Rylie Pavlik " \ + org.opencontainers.image.source=https://github.com/KhronosGroup/DockerContainers/blob/main/openxr-pregenerated-sdk.Dockerfile ENV LANG C.UTF-8 diff --git a/openxr-sdk.Dockerfile b/openxr-sdk.Dockerfile index 0ae4e1e..c2360f2 100644 --- a/openxr-sdk.Dockerfile +++ b/openxr-sdk.Dockerfile @@ -18,7 +18,10 @@ # Intended for CI or interactive use. FROM ubuntu:20.04 -LABEL maintainer="Rylie Pavlik " + +LABEL maintainer="Rylie Pavlik " \ + org.opencontainers.image.authors="Rylie Pavlik " \ + org.opencontainers.image.source=https://github.com/KhronosGroup/DockerContainers/blob/main/openxr-sdk.Dockerfile ENV LANG C.UTF-8 diff --git a/openxr.Dockerfile b/openxr.Dockerfile index 146bf7d..eedd02e 100644 --- a/openxr.Dockerfile +++ b/openxr.Dockerfile @@ -17,7 +17,6 @@ # This is a Docker container for OpenXR specification builds FROM ruby:3.1-bookworm as builder -LABEL maintainer="Rylie Pavlik " # Basic spec build and check packages RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \ @@ -63,6 +62,10 @@ RUN python3 -m pip install --break-system-packages --no-cache-dir git+https://gi # Second stage: start a simpler image that doesn't have the dev packages FROM ruby:3.1-bookworm +LABEL maintainer="Rylie Pavlik " \ + org.opencontainers.image.authors="Rylie Pavlik " \ + org.opencontainers.image.source=https://github.com/KhronosGroup/DockerContainers/blob/main/openxr.Dockerfile + # Copy locally-installed gems and python packages COPY --from=builder /usr/local/ /usr/local/ From a3a4a458a4b2c47950b422dc97e9cb4db78ca696 Mon Sep 17 00:00:00 2001 From: Rylie Pavlik Date: Fri, 12 Apr 2024 17:39:12 -0500 Subject: [PATCH 3/4] Bump the version of all OpenXR images --- build-all.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-all.sh b/build-all.sh index 8c490ab..c8f4368 100755 --- a/build-all.sh +++ b/build-all.sh @@ -10,8 +10,8 @@ set -e ./build-one.sh vulkan-docs-base 202206 "$@" ./build-one.sh vulkan-docs 202206 "$@" ./build-one.sh rust 202312 "$@" - ./build-one.sh openxr 20231010.1 "$@" - ./build-one.sh openxr-sdk 20230614 "$@" - ./build-one.sh openxr-pregenerated-sdk 20230822 "$@" - ./build-one.sh openxr-android 20240312 "$@" + ./build-one.sh openxr 20240412 "$@" + ./build-one.sh openxr-sdk 20240412 "$@" + ./build-one.sh openxr-pregenerated-sdk 20240412 "$@" + ./build-one.sh openxr-android 20240412 "$@" ) From f6446be03ee823a3fe278e3fe7c6f32b48e337b3 Mon Sep 17 00:00:00 2001 From: Rylie Pavlik Date: Fri, 12 Apr 2024 17:38:56 -0500 Subject: [PATCH 4/4] Add a build timestamp to all images at build time --- build-one.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-one.sh b/build-one.sh index dc4163c..2fe8cac 100755 --- a/build-one.sh +++ b/build-one.sh @@ -23,9 +23,11 @@ REPO="khronosgroup/docker-images" OP=$1 shift fi + BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') [ -n "$CI" ] && echo "::group::$DOCKERFILE @ $VERSION" docker build "$@" . -f "$DOCKERFILE.Dockerfile" \ --build-arg "VERSION=$VERSION" \ + --label "org.opencontainers.image.created=$BUILD_DATE" \ -t "$REPO:$DOCKERFILE" \ -t "$REPO:$DOCKERFILE.$VERSION" \ $EXTRA_DOCKER_ARGS