Skip to content

Commit f46dd71

Browse files
authored
Merge pull request #31 from rpavlik/update-pregen-openxr
Bump datestamp for docker
2 parents 3718524 + fea283e commit f46dd71

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

build-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ set -e
1010
./build-one.sh vulkan-docs-base 202206 "$@"
1111
./build-one.sh vulkan-docs 202206 "$@"
1212
./build-one.sh rust 202206 "$@"
13-
./build-one.sh openxr 20230614 "$@"
13+
./build-one.sh openxr 20231010.1 "$@"
1414
./build-one.sh openxr-sdk 20230614 "$@"
15-
./build-one.sh openxr-pregenerated-sdk 202201 "$@"
15+
./build-one.sh openxr-pregenerated-sdk 20230822 "$@"
1616
./build-one.sh openxr-android 20230713 "$@"
1717
)

openxr.Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# This is a Docker container for OpenXR specification builds
1818

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

2222
# Basic spec build and check packages
@@ -52,24 +52,25 @@ RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
5252
RUN gem install rake asciidoctor coderay json-schema rghost
5353
# Newer versions break our index customizer, haven't figured out the fix yet.
5454
RUN gem install asciidoctor-pdf --version 1.6.2
55-
RUN MATHEMATICAL_SKIP_STRDUP=1 gem install asciidoctor-mathematical
55+
# RUN MATHEMATICAL_SKIP_STRDUP=1 gem install asciidoctor-mathematical
56+
RUN gem install rouge
5657

5758
# Basic pip packages
58-
RUN python3 -m pip install --no-cache-dir codespell pypdf2 pdoc3 reuse jinja2-cli
59+
RUN python3 -m pip install --break-system-packages --no-cache-dir codespell pypdf2 pdoc3 reuse jinja2-cli
5960

6061
# pdf-diff pip package
61-
RUN python3 -m pip install --no-cache-dir git+https://github.com/rpavlik/pdf-diff
62+
RUN python3 -m pip install --break-system-packages --no-cache-dir git+https://github.com/rpavlik/pdf-diff
6263

6364
# Second stage: start a simpler image that doesn't have the dev packages
64-
FROM ruby:2.7-bullseye
65+
FROM ruby:3.1-bookworm
6566

6667
# Copy locally-installed gems and python packages
6768
COPY --from=builder /usr/local/ /usr/local/
6869

6970
# Runtime-required packages
7071
RUN env DEBIAN_FRONTEND=noninteractive apt-get update -qq && \
7172
env DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq \
72-
clang-format \
73+
clang-format-13 \
7374
fonts-lyx \
7475
ghostscript \
7576
git \

0 commit comments

Comments
 (0)