diff --git a/CHANGELOG.md b/CHANGELOG.md index 189cc3d..7b5d15d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ - `naev-steamruntime` (Used for testing linux steam builds in the steamruntime (sniper) environment with extra dependencies installed.) - `naev-windows` (Used to cross compile for Windows.) +### v1.10.1 +- Checkout `upcoming` branch of naev-website when building naev-docs + ### v1.10.0 - Bump minimum macOS version for arm64 to 12.0, due to issues with gettext packaging. diff --git a/naev-docs/Dockerfile b/naev-docs/Dockerfile index efc2de4..72484f7 100644 --- a/naev-docs/Dockerfile +++ b/naev-docs/Dockerfile @@ -1,7 +1,7 @@ -# Build luarocks and ruby in build container to save space. +# Build ruby in build container to save space. FROM registry.fedoraproject.org/fedora-minimal:latest AS build -# Install luarocks and ruby deps +# Install ruby deps RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install findutils gcc git gzip \ libyaml libyaml-devel make openssl openssl-devel tar unzip automake findutils g++ zlib-devel && \ microdnf clean all @@ -29,6 +29,7 @@ RUN mkdir websiteTemp && \ git clone --recurse https://github.com/naev/naev-website.git websiteTemp && \ # Install Website Build gems. cd websiteTemp && \ + git checkout upcoming && \ bundle install -j"$(nproc --all)" && \ rm -rf /tmp/websiteTemp