From c1f0b560e8df120f9d276ff8e3142166e2c9121a Mon Sep 17 00:00:00 2001 From: Mario Ban Date: Fri, 24 May 2019 07:33:41 +0200 Subject: [PATCH] Clean-up --- Dockerfile | 5 ++--- README.md | 28 +++++++++++++++------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index af1708e..8a1d79a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM haskell -LABEL version="1.1.0" +LABEL version="1.1.1" LABEL maintainer="Mario Ban " # Install additional packages @@ -50,7 +50,7 @@ USER docker:docker # Aliases RUN sed -i -e 's/#force_color_prompt=yes/force_color_prompt=yes/' -e 's/#alias l/alias l/' /home/docker/.bashrc -# Install pandoc (pandoc-2.3.1 or current pandoc 2.5) +# Install pandoc (current pandoc 2.7.2) RUN cabal update && \ cabal install pandoc @@ -67,4 +67,3 @@ ENTRYPOINT ["/bin/bash"] #ENTRYPOINT ["pandoc"] #CMD ["--help"] - diff --git a/README.md b/README.md index d095fb3..1fe57f8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # docker-pandoc [![Size](https://img.shields.io/microbadger/image-size/mokolea/pandoc.svg)](https://hub.docker.com/r/mokolea/pandoc) [![Layers](https://img.shields.io/microbadger/layers/mokolea/pandoc.svg)](https://hub.docker.com/r/mokolea/pandoc) -Test markdown using pandoc v2.5 +Test markdown using pandoc v2.7.n [![Release](https://img.shields.io/github/release/Mokolea/docker-pandoc.svg)](https://github.com/Mokolea/docker-pandoc/releases) @@ -12,27 +12,29 @@ Test markdown using pandoc v2.5 - https://github.com/jgm/pandoc ## Usage - - Start container from current markdown-project directory: `$ docker run -it -v $(pwd):/data --name pandoc25 -h pandoc25 mokolea/pandoc:latest` - - Optional: Set user and group IDs to override the default user: `$ docker run -it -v $(pwd):/data -u $(id -u):$(id -g) --name pandoc25 -h pandoc25 mokolea/pandoc:latest` - - Subsequent use of the same container: `$ docker start -ai pandoc25` - - Start bash shell in the already running container: `$ docker exec -it pandoc25 bash` + - Start container from current markdown-project directory: `$ docker run -it -v $(pwd):/data --name pandoc -h pandoc mokolea/pandoc:latest` + - Optional: Set user and group IDs to override the default image user (1000:1000) by using parameter: + - `-u root` for root user + - `-u $(id -u):$(id -g)` for current host user (experimental - does not work without additional configuration) + - Subsequent use of the same container: `$ docker start -ai pandoc` + - Start bash shell in the already running container: `$ docker exec -it pandoc bash` ## Test ``` -root@pandoc25:/data# pandoc --version -pandoc 2.5 -Compiled with pandoc-types 1.17.5.4, texmath 0.11.1.2, skylighting 0.7.5 -Default user data directory: /root/.pandoc -Copyright (C) 2006-2018 John MacFarlane +docker@pandoc:/data$ pandoc --version +pandoc 2.7.2 +Compiled with pandoc-types 1.17.5.4, texmath 0.11.2.2, skylighting 0.7.7 +Default user data directory: /home/docker/.local/share/pandoc or /home/docker/.pandoc +Copyright (C) 2006-2019 John MacFarlane Web: http://pandoc.org This is free software; see the source for copying conditions. There is no warranty, not even for merchantability or fitness for a particular purpose. -root@pandoc25:/data# +docker@pandoc:/data$ -root@pandoc25:/data# pandoc -o hello-world.pdf hello-world.md +docker@pandoc:/data$ pandoc -o hello-world.pdf hello-world.md -root@pandoc25:/data# pandoc -s -o hello-world.html hello-world.md --metadata pagetitle="hello-world" +docker@pandoc:/data$ pandoc -s -o hello-world.html hello-world.md --metadata pagetitle="hello-world" ``` ## TODO