Skip to content

Commit

Permalink
fix: asciidoc build to run as user (#802) (#802)
Browse files Browse the repository at this point in the history
Signed-off-by: Tronje Krop <tronje.krop@zalando.de>
  • Loading branch information
tkrop committed Apr 16, 2024
1 parent d0831f0 commit cc8d31d
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
SHELL := /bin/bash
DOCKER := asciidoctor/docker-asciidoctor:latest
DOCKER ?= $(shell command -v docker || command -v podman || docker)
ASCIIDOC := asciidoctor/docker-asciidoctor:latest
DIRMOUNTS := /documents
DIRCONTENTS := chapters
DIRSCRIPTS := scripts
DIRBUILDS := output
DIRINCLUDES := includes
DIRWORK := $(shell pwd -P)


.PHONY: all clean install lint format pull assets rules html pdf epub force
.PHONY: check check-rules check-rules-duplicates check-rules-incorrects
.PHONY: next-rule-id watch
Expand All @@ -24,7 +26,7 @@ format: $(NVM_BIN)/markdownlint
markdownlint --config .markdownlint.yaml --fix chapters/*.adoc;

pull:
docker pull $(DOCKER);
$(DOCKER) pull $(ASCIIDOC);

check: check-rules
check-rules: check-rules-duplicates check-rules-incorrects
Expand Down Expand Up @@ -63,22 +65,26 @@ $(DIRINCLUDES): models/headers-1.0.0.yaml $(DIRSCRIPTS)/generate-includes.sh
mkdir -p $(DIRINCLUDES); $(DIRSCRIPTS)/generate-includes.sh "$(DIRINCLUDES)";

html: $(DIRINCLUDES) check assets pull
docker run -v $(DIRWORK):$(DIRMOUNTS)/ ${DOCKER} asciidoctor \
-D $(DIRMOUNTS)/$(DIRBUILDS) index.adoc;
$(DOCKER) run --interactive --user=$$(id -u):$$(id -g) \
--volume=$(DIRWORK):$(DIRMOUNTS)/ \
$(ASCIIDOC) asciidoctor -D $(DIRMOUNTS)/$(DIRBUILDS) index.adoc;

watch:
watchexec --exts adoc,css --ignore output -r make html

# Not used any longer.
pdf: $(DIRINCLUDES) check pull
docker run -v $(DIRWORK):$(DIRMOUNTS)/ ${DOCKER} asciidoctor-pdf -v \
$(DOCKER) run --interactive --user=$$(id -u):$$(id -g) \
--volume=$(DIRWORK):$(DIRMOUNTS)/ \
$(ASCIIDOC) asciidoctor-pdf -v \
-a pdf-fontsdir=$(DIRMOUNTS)/resources/fonts \
-a pdf-theme=$(DIRMOUNTS)/resources/themes/pdf-theme.yml \
-D $(DIRMOUNTS)/$(DIRBUILDS) index.adoc;
-D $(DIRMOUNTS)/$(DIRBUILDS) index.adoc;
mv -f $(DIRBUILDS)/index.pdf $(DIRBUILDS)/zalando-guidelines.pdf;

# Not used any longer.
epub: $(DIRINCLUDES) check pull
docker run -v $(DIRWORK):$(DIRMOUNTS)/ ${DOCKER} asciidoctor-epub3 \
-D $(DIRMOUNTS)/$(DIRBUILDS) index.adoc;
$(DOCKER) run --interactive --user=$$(id -u):$$(id -g) \
--volume=$(DIRWORK):$(DIRMOUNTS)/ \
$(ASCIIDOC) asciidoctor-epub3 -D $(DIRMOUNTS)/$(DIRBUILDS) index.adoc;
mv -f $(DIRBUILDS)/index.epub $(DIRBUILDS)/zalando-guidelines.epub;

0 comments on commit cc8d31d

Please sign in to comment.