From d6a95a923a414c01d3f7f619c05bd1102cd51569 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn <6355577+karl-johan-grahn@users.noreply.github.com> Date: Thu, 13 Feb 2025 15:21:24 +0100 Subject: [PATCH] Docs: Update base python image and add params for the combine script (#839) * update * update * update --- .github/workflows/pull_request_docs.yaml | 9 +++++++++ Dockerfile-docs | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request_docs.yaml b/.github/workflows/pull_request_docs.yaml index 178a318..5dc2d0c 100644 --- a/.github/workflows/pull_request_docs.yaml +++ b/.github/workflows/pull_request_docs.yaml @@ -20,3 +20,12 @@ jobs: MD_CONFIG: .github/md_config.json DOC_SRC: docs MD_LINT_CONFIG: .markdownlint.yaml + build: + uses: stakater/.github/.github/workflows/pull_request_container_build.yaml@v0.0.122 + with: + DOCKER_FILE_PATH: Dockerfile-docs + CONTAINER_REGISTRY_URL: ghcr.io/stakater + secrets: + CONTAINER_REGISTRY_USERNAME: ${{ github.actor }} + CONTAINER_REGISTRY_PASSWORD: ${{ secrets.GHCR_TOKEN }} + SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }} diff --git a/Dockerfile-docs b/Dockerfile-docs index a126021..eb8efa4 100644 --- a/Dockerfile-docs +++ b/Dockerfile-docs @@ -1,4 +1,4 @@ -FROM python:3.12 as builder +FROM python:3.13-alpine as builder # set workdir RUN mkdir -p $HOME/application @@ -10,7 +10,7 @@ COPY --chown=1001:root . . RUN pip3 install -r theme_common/requirements.txt # Combine Theme Resources -RUN python theme_common/scripts/combine_theme_resources.py theme_common/resources theme_override/resources dist/_theme +RUN python theme_common/scripts/combine_theme_resources.py -s theme_common/resources -ov theme_override/resources -o dist/_theme # Produce mkdocs file RUN python theme_common/scripts/combine_mkdocs_config_yaml.py theme_common/mkdocs.yml theme_override/mkdocs.yml mkdocs.yml