Merge branch 'release/0.6.0'

.drone.yml

@@ -7,8 +7,6 @@ steps:
   image: plugins/docker
   settings:
     repo: ldericher/autodoc
-    context: src
-    dockerfile: src/Dockerfile
     auto_tag: true
     username:
       from_secret: DOCKER_USERNAME

Dockerfile

@@ -0,0 +1,15 @@
+FROM pandoc/extra:latest
+
+RUN set -ex; \
+    \
+    apk add --no-cache \
+      bash \
+      inotify-tools \
+      make \
+    ;
+
+COPY src/usr /usr
+
+WORKDIR /docs
+ENTRYPOINT ["autodoc"]
+CMD ["-bw"]

Makefile

@@ -0,0 +1,28 @@
+image_tag = ldericher/autodoc
+docker_build = docker build
+docker_run = docker run --rm -it
+examples_flags = -v "$(shell pwd)/examples:/docs" -u "$(shell id -u):$(shell id -g)"
+
+.PHONY: default
+default:
+	$(info use other targets: image build watch shell clean)
+
+.PHONY: image
+image:
+	$(docker_build) --tag $(image_tag) ./
+
+.PHONY: build
+build: image
+	$(docker_run) $(examples_flags) $(image_tag) -b
+
+.PHONY: watch
+watch: image
+	$(docker_run) $(examples_flags) $(image_tag)
+
+.PHONY: shell
+shell: image
+	$(docker_run) $(examples_flags) --entrypoint ash $(image_tag)
+
+.PHONY: clean
+clean:
+	git clean -xdf ./examples

README.md

@@ -8,7 +8,7 @@ In general, any file-sharing solution -- preferably on top of `docker-compose` -
 
 ## Quick Start Guide using Docker
 
-The `autodoc` image [available on Docker Hub](https://hub.docker.com/r/ldericher/autodoc) is based on [pandocker](https://hub.docker.com/r/ldericher/pandocker) providing Ubuntu's TeXlive `LaTeX` and `pandoc` in a simple box.
+The `autodoc` image [available on Docker Hub](https://hub.docker.com/r/ldericher/autodoc) is based on [pandoc/extra](https://hub.docker.com/r/pandoc/extra) providing TeXlive `LaTeX` and `pandoc` in a container.
 
 01. Install [Docker CE](https://docs.docker.com/install/)
 
@@ -18,7 +18,7 @@ The `autodoc` image [available on Docker Hub](https://hub.docker.com/r/ldericher
 
     ```bash
     docker run --rm -it \
-     --volume "${PWD}":/docs \
+     --volume "${PWD}:/docs" \
      --user "$(id -u):$(id -g)" \
      ldericher/autodoc
     ```
@@ -58,7 +58,6 @@ services:
       - documents:/opt/autodoc
 
   autodoc:
-    restart: always
     image: ldericher/autodoc
     user: "UID:GID"
     volumes:

docker-compose.yml

@@ -1,16 +0,0 @@
-version: "2"
-
-services:
-  autodoc:
-    restart: "no"
-
-    image: ldericher/autodoc
-    build:
-      context: ./src
-
-    command: "bash"
-
-    volumes:
-      - "${PWD}/src/usr/local/bin/autodoc:/usr/local/bin/autodoc:ro"
-      - "${PWD}/src/usr/local/lib/autodoc:/usr/local/lib/autodoc:ro"
-      - "${PWD}/examples:/docs"

examples/eisvogel/.gitignore

@@ -0,0 +1 @@
+*.pdf

examples/eisvogel/Makefile

@@ -0,0 +1,8 @@
+#%SRCPAT% \.url$
+
+.PHONY: all
+all: eisvogel.pdf
+
+.PHONY: eisvogel.pdf
+eisvogel.pdf: document.md.url
+	wget -O- '$(file < $<)' | pandoc -s -f markdown -t latex -o $@ --template eisvogel

examples/eisvogel/document.md.url

@@ -0,0 +1 @@
+https://raw.githubusercontent.com/Wandmalfarbe/pandoc-latex-template/master/examples/basic-example/document.md

examples/simple md/simple.md

@@ -15,7 +15,7 @@ Behold, for there is jumbled mess ahead!
 
 With the default HTML template, this does not translate: \textsl{Have some \LaTeX, too!}  
 Some math is fine with HTML: $x=5$, some other is not: $\sqrt{x}=2$.  
-However, both of these are fixable!
+However, both of these work with the `--webtex` switch for pandoc!
 
 Code blocks? Sure!
 

src/Dockerfile

@@ -1,10 +0,0 @@
-FROM ldericher/pandocker:latest
-
-RUN set -ex; \
-    apt-get update && apt-get -y install \
-      inotify-tools \
-    ; rm -rf /var/lib/apt/lists/*;
-
-COPY usr /usr
-
-CMD ["autodoc", "-bw"]