From d549923538a7fdaa28ff6de0f1e60fc2d60d73ec Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Fri, 21 Mar 2025 14:22:09 +0100 Subject: [PATCH] solved last sphinx bugs --- docs/Dockerfile | 14 +++++++++----- roles/docker-sphinx/vars/main.yml | 16 ++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index a58f0b71..77fd5d32 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -12,18 +12,22 @@ ENV SPHINX_SOURCE_DIR=${SPHINX_SOURCE_DIR} ENV SPHINX_OUTPUT_DIR=${SPHINX_OUTPUT_DIR} ENV SPHINX_REQUIREMENTS_DIR=${SPHINX_EXEC_DIR}/requirements -# Build the requirement files -RUN cd ${SPHINX_EXEC_DIR} && make requirements - -# Install required packages -RUN apt-get update && xargs -a ${SPHINX_REQUIREMENTS_DIR}/apt.txt apt install -y # Set the working directory WORKDIR ${SPHINX_DOCKER_EXEC_DIR} +# Update and install make +RUN apt-get update && apt install -y make + # Copy the project files into the container COPY ${SPHINX_SOURCE_DIR_RELATIVE} ${SPHINX_DOCKER_EXEC_DIR} +# Build the requirement files +RUN cd ${SPHINX_EXEC_DIR} && make extract-requirements + +# Install required packages +RUN xargs -a ${SPHINX_REQUIREMENTS_DIR}/apt.txt apt install -y + # Install Python packages via requirements.txt RUN pip install --upgrade pip && pip install -r ${SPHINX_REQUIREMENTS_DIR}/pip.txt diff --git a/roles/docker-sphinx/vars/main.yml b/roles/docker-sphinx/vars/main.yml index f60ec0fd..d7ea98b5 100644 --- a/roles/docker-sphinx/vars/main.yml +++ b/roles/docker-sphinx/vars/main.yml @@ -1,12 +1,12 @@ application_id: "sphinx" -host_sphinx_source_dir_relative: "volumes/source/" # Place where the sphinx source repository is stored on the host -host_sphinx_source_dir_absolute: "{{docker_compose.directories.instance}}{{host_sphinx_source_dir_relative}}" # Place where the sphinx source repository is stored on the host +host_sphinx_source_dir_relative: "volumes/source/" # Place where the sphinx source repository is stored on the host +host_sphinx_source_dir_absolute: "{{docker_compose.directories.instance}}{{host_sphinx_source_dir_relative}}" # Place where the sphinx source repository is stored on the host -docker_app_dir: "/app/" # Folder in which the application is running -docker_source_dir: "{{docker_app_dir}}" # Folder which is used to be screened -docker_output_dir: "/output/" # Folder to which the output is fuuuucking putted! -docker_exec_dir: "{{docker_app_dir}}{{applications.sphinx.sphinx_exec_dir_relative}}" # Folder which contains the sphinxs makefile and logic +docker_app_dir: "/app/" # Folder in which the application is running +docker_source_dir: "{{docker_app_dir}}" # Folder which is used to be screened +docker_output_dir: "/output/" # Folder to which the output is fuuuucking putted! +docker_exec_dir: "{{ [ docker_app_dir, applications.sphinx.sphinx_exec_dir_relative ] | path_join }}" # Folder which contains the sphinxs makefile and logic -sphinx_host_dockerfile: "{{ docker_compose.directories.instance }}Dockerfile" # Path to the Dockerfile to build sphinx -sphinx_control_node_dockerfile: "{{ [ playbook_dir, 'docs/Dockerfile' ] | path_join }}" # Path to the Dockerfile on the control node \ No newline at end of file +sphinx_host_dockerfile: "{{ docker_compose.directories.instance }}Dockerfile" # Path to the Dockerfile to build sphinx on the server +sphinx_control_node_dockerfile: "{{ [ playbook_dir, 'docs/Dockerfile' ] | path_join }}" # Path to the Dockerfile on the control node \ No newline at end of file