From ff82c631b4ceca5c331d33da18de4220cf7ddcb9 Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Mon, 30 Sep 2024 18:12:26 +0200 Subject: [PATCH] fix: makefile tasks for watch --- docker/entrypoint.sh | 17 ++++++++++------- mkdocs-source.yml | 1 + tasks/docker.mk | 3 +++ tasks/docs.mk | 4 ---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index c8d91de..224e8ea 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -9,6 +9,7 @@ echo "Arguments: $ARGS" EXT_UID=${EXT_UID:-999} EXT_GID=${EXT_GID:-999} + # Create missing directories mkdir -p _cache mkdir -p _build @@ -25,12 +26,13 @@ if ! grep -q "^[^:]*:[^:]*:$EXT_UID:" /etc/passwd ; then useradd -r -u "$EXT_UID" -g appuser appuser fi -chown -R "$EXT_UID:$EXT_GID" _cache -chown -R "$EXT_UID:$EXT_GID" _build -chown -R "$EXT_UID:$EXT_GID" .marp -chown -R "$EXT_UID:$EXT_GID" /home/appuser -chown -R "$EXT_UID:$EXT_GID" slides -chown -R "$EXT_UID:$EXT_GID" docs +# echo "Setting permissions to $EXT_UID:$EXT_GID" +# chown -R "$EXT_UID:$EXT_GID" _cache +# chown -R "$EXT_UID:$EXT_GID" _build +# chown -R "$EXT_UID:$EXT_GID" .marp +# chown -R "$EXT_UID:$EXT_GID" /home/appuser +# chown -R "$EXT_UID:$EXT_GID" slides +# chown -R "$EXT_UID:$EXT_GID" docs # Patch mkdocs configuration # set -x @@ -49,5 +51,6 @@ fi if [ "$1" = "supershell" ]; then exec bash else - exec gosu "$EXT_UID:$EXT_GID" make "$@" + # exec gosu "$EXT_UID:$EXT_GID" make "$@" + exec make "$@" fi diff --git a/mkdocs-source.yml b/mkdocs-source.yml index a2825d9..c0f92dd 100644 --- a/mkdocs-source.yml +++ b/mkdocs-source.yml @@ -57,6 +57,7 @@ extra_javascript: markdown_extensions: - footnotes - admonition + - md_in_html - toc: permalink: '#' diff --git a/tasks/docker.mk b/tasks/docker.mk index a7b899e..d28b180 100644 --- a/tasks/docker.mk +++ b/tasks/docker.mk @@ -10,6 +10,9 @@ docker-build: ## build docker image glenux/docmachine:$(BUILD_VERSION) \ glenux/docmachine:latest +docker-save: + env docker save glenux/docmachine:latest > ~/.cache/docmachine/image.tar + docker-push: ## push docker image env docker push glenux/docmachine:latest diff --git a/tasks/docs.mk b/tasks/docs.mk index 8a6e235..257d80b 100644 --- a/tasks/docs.mk +++ b/tasks/docs.mk @@ -55,10 +55,6 @@ watch-docs-internal: watch-docs: ## run development server for static docs site pipenv run honcho start watch-docs watch-toc -.PHONY: watch-docs -watch: watch-docs - - build-pdf: build-docs-pdf ## build docs as PDF files build-html: build-docs-html ## build docs as HTML files build-docs: build-docs-pdf build-docs-html ## build only docs as PDF and HTML