Compare commits
2 commits
39d701f946
...
a0279653f5
Author | SHA1 | Date | |
---|---|---|---|
a0279653f5 | |||
3cea2ba18d |
6 changed files with 37 additions and 11 deletions
15
Makefile
15
Makefile
|
@ -63,6 +63,7 @@ DOCS_IMAGES_ORA_PNG=$(patsubst $(IMAGES_DIR)/%.ora,$(BUILD_IMAGES_DIR)/%.ora.png
|
||||||
## Merge all lists
|
## Merge all lists
|
||||||
DOCS_IMAGES_SVG=$(DOCS_IMAGES_DOT_SVG) $(DOCS_IMAGES_CIRCO_SVG) $(DOCS_IMAGES_UML_SVG)
|
DOCS_IMAGES_SVG=$(DOCS_IMAGES_DOT_SVG) $(DOCS_IMAGES_CIRCO_SVG) $(DOCS_IMAGES_UML_SVG)
|
||||||
DOCS_IMAGES_PNG=$(DOCS_IMAGES_ORA_PNG)
|
DOCS_IMAGES_PNG=$(DOCS_IMAGES_ORA_PNG)
|
||||||
|
export
|
||||||
|
|
||||||
all: help
|
all: help
|
||||||
|
|
||||||
|
@ -111,11 +112,8 @@ watch: ## run development server
|
||||||
pipenv run honcho start
|
pipenv run honcho start
|
||||||
|
|
||||||
serve: watch
|
serve: watch
|
||||||
serve-docs: watch-docs
|
|
||||||
|
|
||||||
.PHONY: watch serve
|
.PHONY: watch serve
|
||||||
.PHONY: watch-docs serve-docs
|
|
||||||
.PHONY: watch-docs-internal
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## Build final documents
|
## Build final documents
|
||||||
|
@ -126,13 +124,9 @@ serve-docs: watch-docs
|
||||||
|
|
||||||
build: build-pdf build-html ## build all documents as PDF and HTML files
|
build: build-pdf build-html ## build all documents as PDF and HTML files
|
||||||
|
|
||||||
build-pptx: build-slides-pptx ## build slides as PPTX files
|
build-pptx: ## build both docs and slides as PPTX files
|
||||||
|
build-html: ## build both docs and slides as HTML files
|
||||||
build-pdf: build-docs-pdf build-slides-pdf ## build both docs and slides as PDF files
|
build-pdf: ## build both docs and slides as PDF files
|
||||||
|
|
||||||
build-html: build-docs-html build-slides-html ## build both docs and slides as HTML files
|
|
||||||
|
|
||||||
build-docs: build-docs-pdf build-docs-html ## build only docs as PDF and HTML
|
|
||||||
|
|
||||||
.PHONY: build
|
.PHONY: build
|
||||||
|
|
||||||
|
@ -162,4 +156,5 @@ include tasks/slides.mk
|
||||||
include tasks/docker.mk
|
include tasks/docker.mk
|
||||||
include tasks/utils.mk
|
include tasks/utils.mk
|
||||||
include tasks/images.mk
|
include tasks/images.mk
|
||||||
|
include tasks/shell.mk
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,8 @@ chown -R "$EXT_UID:$EXT_GID" _cache
|
||||||
chown -R "$EXT_UID:$EXT_GID" _build
|
chown -R "$EXT_UID:$EXT_GID" _build
|
||||||
chown -R "$EXT_UID:$EXT_GID" .marp
|
chown -R "$EXT_UID:$EXT_GID" .marp
|
||||||
chown -R "$EXT_UID:$EXT_GID" /home/appuser
|
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
|
# Patch mkdocs configuration
|
||||||
# set -x
|
# set -x
|
||||||
|
@ -44,7 +46,7 @@ else
|
||||||
fi
|
fi
|
||||||
# set +x
|
# set +x
|
||||||
|
|
||||||
if [ "$1" = "shell" ]; then
|
if [ "$1" = "supershell" ]; then
|
||||||
exec bash
|
exec bash
|
||||||
else
|
else
|
||||||
exec gosu "$EXT_UID:$EXT_GID" make "$@"
|
exec gosu "$EXT_UID:$EXT_GID" make "$@"
|
||||||
|
|
|
@ -4,6 +4,7 @@ docker-build: ## build docker image
|
||||||
docker build \
|
docker build \
|
||||||
--file docker/Dockerfile \
|
--file docker/Dockerfile \
|
||||||
--tag glenux/docmachine:$(BUILD_VERSION) \
|
--tag glenux/docmachine:$(BUILD_VERSION) \
|
||||||
|
--output type=docker \
|
||||||
.
|
.
|
||||||
docker tag \
|
docker tag \
|
||||||
glenux/docmachine:$(BUILD_VERSION) \
|
glenux/docmachine:$(BUILD_VERSION) \
|
||||||
|
|
|
@ -58,3 +58,13 @@ watch-docs: ## run development server for static docs site
|
||||||
.PHONY: watch-docs
|
.PHONY: watch-docs
|
||||||
watch: 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
|
||||||
|
|
||||||
|
serve-docs: watch-docs
|
||||||
|
|
||||||
|
.PHONY: watch-docs serve-docs
|
||||||
|
.PHONY: watch-docs-internal
|
||||||
|
|
||||||
|
|
9
tasks/shell.mk
Normal file
9
tasks/shell.mk
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
|
||||||
|
.PHONY: supershell
|
||||||
|
supershell: shell
|
||||||
|
|
||||||
|
.PHONY: shell
|
||||||
|
shell:
|
||||||
|
@echo "Running shell..."
|
||||||
|
@bash
|
||||||
|
|
|
@ -104,3 +104,12 @@ watch-tocupdate-internal:
|
||||||
$(MAKE) images ; \
|
$(MAKE) images ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
.PHONY: build-slides-pdf
|
||||||
|
build-pdf: build-slides-pdf ## build slides as PDF files
|
||||||
|
|
||||||
|
.PHONY: build-slides-html
|
||||||
|
build-html: build-slides-html ## build slides as HTML files
|
||||||
|
|
||||||
|
.PHONY: build-slides-pptx
|
||||||
|
build-pptx: build-slides-pptx ## build slides as PPTX files
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue