fixup docker/make

Author: c2main

docs/Makefile

@@ -32,7 +32,7 @@ ifdef USE_DOCKER
 endif
 
 ifdef USE_DOCKER
-SPHINXBUILD = docker run --rm -v $(SOURCEDIR)/:/docs $(SPHINX_IMAGE) sphinx-build
+SPHINXBUILD = docker run --rm -u $(shell id -u):$(shell id -g) -v $(SOURCEDIR)/:/docs $(SPHINX_IMAGE) sphinx-build
 docker.id: Dockerfile
 	docker build --iidfile docker.id --file $< -t $(SPHINX_IMAGE) .
 else
@@ -43,12 +43,15 @@ endif
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
+.PHONY: html
+html: $(BUILDDIR)/html
+
 .PHONY: tikz
 tikz:
 	$(MAKE) -C tikz all
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-html: $(DEPS) docker.id
+$(BUILDDIR)/html: $(DEPS) docker.id
 	echo $?
-	$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/tikz/Dockerfile

@@ -21,10 +21,14 @@ RUN apt-get update \
      texlive-luatex \
      && rm -rf /var/lib/apt/lists/*
 
-RUN TERM=dumb luaotfload-tool --update
-
 WORKDIR /tikz
 
 ENV TERM=dumb
 
+ENV TEXMFHOME = $HOME/.cache/
+ENV TEXMFVAR = $HOME/.cache/texmf-var/
+ENV TEXMFCONFIG = $TEXMFSYSCONFIG
+
+RUN luaotfload-tool --update
+
 CMD ["make", "all"]

docs/tikz/Makefile

@@ -33,8 +33,8 @@ ifdef USE_DOCKER
 endif
 
 ifdef USE_DOCKER
-LATEXMK    = docker run --rm -v ./:/tikz $(TIKZ_IMAGE) latexmk
-PDFTOCAIRO = docker run --rm -v ./:/tikz $(TIKZ_IMAGE) pdftocairo
+LATEXMK    = docker run --rm -u $(shell id -u):$(shell id -g) -v ./:/tikz $(TIKZ_IMAGE) latexmk
+PDFTOCAIRO = docker run --rm -u $(shell id -u):$(shell id -g) -v ./:/tikz $(TIKZ_IMAGE) pdftocairo
 docker.id: Dockerfile
 	docker build --iidfile docker.id --file $< -t $(TIKZ_IMAGE) .
 else