Merge pull request #29 from rpavlik/simplify-openxr

Simplify OpenXR

Author: rpavlik

build-all.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2019-2021 The Khronos Group Inc.
+# Copyright 2019-2023 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 set -e
@@ -10,8 +10,7 @@ set -e
     ./build-one.sh vulkan-docs-base 202206 "$@"
     ./build-one.sh vulkan-docs 202206 "$@"
     ./build-one.sh rust 202206 "$@"
-    ./build-one.sh openxr-base 202110 "$@"
-    ./build-one.sh openxr 202110 "$@"
-    ./build-one.sh openxr-sdk 202110 "$@"
+    ./build-one.sh openxr 20230614 "$@"
+    ./build-one.sh openxr-sdk 20230614 "$@"
     ./build-one.sh openxr-pregenerated-sdk 202201 "$@"
 )

openxr-base.Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021, The Khronos Group Inc.
+# Copyright (c) 2019-2023, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -17,7 +17,7 @@
 # This is a Docker container for OpenXR SDK CI builds.
 # Intended for CI use.
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 LABEL maintainer="Ryan Pavlik <ryan.pavlik@collabora.com>"
 
 ENV LANG C.UTF-8
@@ -26,6 +26,7 @@ ENV LANG C.UTF-8
 RUN dpkg --add-architecture i386
 
 # Runtime-required packages
+# No Python on purpose: this is to make sure we can do the build without python if we have a pregenerated tree (a la OpenXR-SDK)
 RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
     env DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq \
     build-essential \

openxr-pregenerated-sdk.Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021 The Khronos Group Inc.
+# Copyright (c) 2019-2023 The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -17,7 +17,7 @@
 # This is a Docker container for OpenXR SDK CI builds.
 # Intended for CI or interactive use.
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 LABEL maintainer="Ryan Pavlik <ryan.pavlik@collabora.com>"
 
 ENV LANG C.UTF-8
@@ -26,15 +26,16 @@ ENV LANG C.UTF-8
 RUN dpkg --add-architecture i386
 
 # Runtime-required packages
-RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y -qq \
+RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
+    env DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq \
     apt-transport-https \
     build-essential \
     ca-certificates \
     clang-10 \
     clang-format-10 \
     cmake \
     git \
+    git-lfs \
     gnupg \
     libegl1-mesa-dev \
     libgl1-mesa-dev \

openxr-sdk.Dockerfile

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021, The Khronos Group Inc.
+# Copyright (c) 2019-2023, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -14,15 +14,91 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This is a Docker container for (interactive) OpenXR specification builds
+# This is a Docker container for OpenXR specification builds
 
-ARG VERSION
-
-FROM khronosgroup/docker-images:openxr-base.$VERSION
+FROM ruby:2.7-bullseye as builder
 LABEL maintainer="Ryan Pavlik <ryan.pavlik@collabora.com>"
 
-# Add the entrypoint to the image
+# Basic spec build and check packages
+RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
+    env DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq \
+    bison \
+    build-essential \
+    cmake \
+    flex \
+    fonts-lyx \
+    ghostscript \
+    git \
+    imagemagick \
+    libpango1.0-dev \
+    libreadline-dev \
+    pdftk \
+    poppler-utils \
+    python3 \
+    python3-dev \
+    python3-attr \
+    python3-chardet \
+    python3-lxml \
+    python3-networkx \
+    python3-pillow \
+    python3-pip \
+    python3-requests \
+    python3-setuptools \
+    python3-wheel \
+    wget && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+# Basic gems
+RUN gem install rake asciidoctor coderay json-schema rghost
+# 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
+
+# Basic pip packages
+RUN python3 -m pip install --no-cache-dir codespell pypdf2 pdoc3 reuse jinja2-cli
+
+# pdf-diff pip package
+RUN python3 -m pip install --no-cache-dir git+https://github.com/rpavlik/pdf-diff
+
+# Second stage: start a simpler image that doesn't have the dev packages
+FROM ruby:2.7-bullseye
+
+# Copy locally-installed gems and python packages
+COPY --from=builder /usr/local/ /usr/local/
+
+# Runtime-required packages
+RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
+    env DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq \
+    clang-format \
+    fonts-lyx \
+    ghostscript \
+    git \
+    git-lfs \
+    gosu \
+    imagemagick \
+    jing \
+    libpango1.0-0 \
+    libxml2-utils \
+    pdftk \
+    poppler-utils \
+    python3 \
+    python3-attr \
+    python3-chardet \
+    python3-lxml \
+    python3-networkx \
+    python3-pillow \
+    python3-pytest \
+    python3-requests \
+    python3-utidylib \
+    python3-venv \
+    trang \
+    wget \
+    xmlstarlet && \
+    apt-get clean
+
+# Add the optional entrypoint to the image
 COPY entrypoint.openxr.sh /root/entrypoint.openxr.sh
 RUN chmod +x /root/entrypoint.openxr.sh
 
-ENTRYPOINT ["/root/entrypoint.openxr.sh"]
+# When running, to start an interactive session, pass:
+# --entrypoint /root/entrypoint.openxr.sh -e "USER_ID=$(id -u)" -e "GROUP_ID=$(id -g)" -v "$MOUNTPOINT:$MOUNTPOINT" -e "CONTAINER_CWD=$MOUNTPOINT"