Skip to content

Commit

Permalink
Merge pull request #31 from rpavlik/update-pregen-openxr
Browse files Browse the repository at this point in the history
Bump datestamp for docker
  • Loading branch information
rpavlik authored Oct 10, 2023
2 parents 3718524 + fea283e commit f46dd71
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ set -e
./build-one.sh vulkan-docs-base 202206 "$@"
./build-one.sh vulkan-docs 202206 "$@"
./build-one.sh rust 202206 "$@"
./build-one.sh openxr 20230614 "$@"
./build-one.sh openxr 20231010.1 "$@"
./build-one.sh openxr-sdk 20230614 "$@"
./build-one.sh openxr-pregenerated-sdk 202201 "$@"
./build-one.sh openxr-pregenerated-sdk 20230822 "$@"
./build-one.sh openxr-android 20230713 "$@"
)
13 changes: 7 additions & 6 deletions openxr.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# This is a Docker container for OpenXR specification builds

FROM ruby:2.7-bullseye as builder
FROM ruby:3.1-bookworm as builder
LABEL maintainer="Ryan Pavlik <ryan.pavlik@collabora.com>"

# Basic spec build and check packages
Expand Down Expand Up @@ -52,24 +52,25 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
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
# RUN MATHEMATICAL_SKIP_STRDUP=1 gem install asciidoctor-mathematical
RUN gem install rouge

# Basic pip packages
RUN python3 -m pip install --no-cache-dir codespell pypdf2 pdoc3 reuse jinja2-cli
RUN python3 -m pip install --break-system-packages --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
RUN python3 -m pip install --break-system-packages --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
FROM ruby:3.1-bookworm

# 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 \
clang-format-13 \
fonts-lyx \
ghostscript \
git \
Expand Down

0 comments on commit f46dd71

Please sign in to comment.