Makefile

@@ -63,7 +63,6 @@ DOCS_IMAGES_ORA_PNG=$(patsubst $(IMAGES_DIR)/%.ora,$(BUILD_IMAGES_DIR)/%.ora.png
 ## Merge all lists
 DOCS_IMAGES_SVG=$(DOCS_IMAGES_DOT_SVG) $(DOCS_IMAGES_CIRCO_SVG) $(DOCS_IMAGES_UML_SVG)
 DOCS_IMAGES_PNG=$(DOCS_IMAGES_ORA_PNG)
-export
 
 all: help
 
@@ -112,8 +111,11 @@ watch: ## run development server
 	pipenv run honcho start
 
 serve: watch
+serve-docs: watch-docs
 
 .PHONY: watch serve
+.PHONY: watch-docs serve-docs
+.PHONY: watch-docs-internal
 
 ##
 ## Build final documents 
@@ -124,9 +126,13 @@ serve: watch
 
 build: build-pdf build-html  ## build all documents as PDF and HTML files
 
-build-pptx: ## build both docs and slides as PPTX files
+build-pptx:  build-slides-pptx  ## build slides as PPTX files
-build-html: ## build both docs and slides as HTML files
+
-build-pdf: ## build both docs and slides as PDF files
+build-pdf: build-docs-pdf build-slides-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
 
@@ -156,5 +162,4 @@ include tasks/slides.mk
 include tasks/docker.mk
 include tasks/utils.mk
 include tasks/images.mk
-include tasks/shell.mk
 

docker/entrypoint.sh

@@ -29,8 +29,6 @@ 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
@@ -46,7 +44,7 @@ else
 fi
 # set +x
 
-if [ "$1" = "supershell" ]; then
+if [ "$1" = "shell" ]; then
   exec bash
 else
   exec gosu "$EXT_UID:$EXT_GID" make "$@"

tasks/docker.mk

@@ -4,7 +4,6 @@ docker-build: ## build docker image
 	docker build \
 		--file docker/Dockerfile \
 		--tag glenux/docmachine:$(BUILD_VERSION) \
-		--output type=docker \
 		.
 	docker tag \
 		glenux/docmachine:$(BUILD_VERSION) \

tasks/docs.mk

@@ -58,13 +58,3 @@ watch-docs: ## run development server for static docs site
 .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
-
-serve-docs: watch-docs
-
-.PHONY: watch-docs serve-docs
-.PHONY: watch-docs-internal
-

tasks/shell.mk

@@ -1,9 +0,0 @@
-
-.PHONY: supershell
-supershell: shell
-
-.PHONY: shell
-shell:
-	@echo "Running shell..."
-	@bash
-

tasks/slides.mk

@@ -104,12 +104,3 @@ watch-tocupdate-internal:
 		$(MAKE) images ; \
 	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
-