Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency furo to v2024 #4664

Merged
merged 2 commits into from
Jun 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.8

FROM python:3.12-bookworm as docs-source
FROM python:3.12-bookworm AS docs-source

COPY --link docs/ /docs/

Expand All @@ -11,16 +11,9 @@ SHELL ["/bin/bash", "-c"]
RUN set -euxo pipefail && \
curl -sSL https://install.python-poetry.org | python3 - && \
/root/.local/bin/poetry install --no-interaction && \
/root/.local/bin/poetry run sphinx-build -M dirhtml "." "_build" && \
find /docs/_build/dirhtml/ -type f -size +0 | while read file; do \
filename=$(basename -- "$file"); \
extension="${filename##*.}"; \
if [ "$extension" = "html" ]; then \
python3 /docs/fix-canonical-links.py "$file"; \
fi; \
done;
/root/.local/bin/poetry run sphinx-build -M dirhtml "." "_build"

FROM node:21.7.3 as docs-minification
FROM node:21.7.3 AS docs-minification

COPY --link --from=docs-source /docs/_build/dirhtml/ /docs/

Expand All @@ -41,15 +34,15 @@ RUN set -eux && \
fi; \
done;

FROM scratch as frontend-source
FROM scratch AS frontend-source

# artisan is not strictly required for JS builds but it triggers some behavior inside Laravel Mix
# https://github.com/laravel-mix/laravel-mix/issues/1326#issuecomment-363975710
COPY --link package.json package-lock.json webpack.mix.js artisan /app/
COPY --link resources/ /app/resources/
COPY --link public/ /app/public/

FROM node:21.7.3 as nova-components
FROM node:21.7.3 AS nova-components

COPY --link /nova-components/ /nova-components/

Expand All @@ -67,7 +60,7 @@ RUN set -eux && \
npm install --no-progress && \
npm run production --no-progress

FROM node:20.14.0 as frontend
FROM node:20.14.0 AS frontend

COPY --link --from=frontend-source /app/ /app/

Expand All @@ -78,7 +71,7 @@ RUN set -eux && \
npm ci --no-progress && \
npm run production --no-progress

FROM scratch as backend-source
FROM scratch AS backend-source

COPY --link app/ /app/app/
COPY --link bootstrap/ /app/bootstrap/
Expand All @@ -96,7 +89,7 @@ COPY --link --from=nova-components /nova-components/ClientIdAndSecretModal/dist/
COPY --link --from=nova-components /nova-components/PersonalAccessTokenModal/dist/ /app/nova-components/PersonalAccessTokenModal/dist/
COPY --link --from=docs-minification /docs/ /app/public/docs/

FROM ubuntu:noble as backend-uncompressed
FROM ubuntu:noble AS backend-uncompressed

LABEL maintainer="[email protected]"

Expand Down Expand Up @@ -143,7 +136,7 @@ RUN --mount=type=secret,id=composer_auth,dst=/app/auth.json,uid=33,gid=33,requir

# This target is the default, but skipped during pull request builds and in our recommended local build invocation
# precompressed_assets var on the Nomad job must match whether this stage ran or not
FROM backend-uncompressed as backend-compressed
FROM backend-uncompressed AS backend-compressed

RUN set -eux && \
cd /app/public/ && \
Expand Down
35 changes: 0 additions & 35 deletions docs/fix-canonical-links.py

This file was deleted.

18 changes: 11 additions & 7 deletions docs/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ package-mode = false
[tool.poetry.dependencies]
python = "^3.10"
sphinx = "7.3.7"
furo = "2023.9.10"
sphinx-autobuild = "2024.4.16"
sphinxext-opengraph = "0.9.1"
sphinxcontrib-httpdomain = "1.8.1"
furo = {git = "https://github.com/kberzinch/furo.git", rev = "patch-1"}

[build-system]
requires = ["poetry-core"]
Expand Down
Loading