Merge pull request #14 from marp-team/docker

Add official Docker image

.circleci/config.yml

@@ -57,9 +57,34 @@ jobs:
     docker:
       - image: circleci/node:6.14.2-browsers
 
+  docker-image:
+    docker:
+      - image: docker:git
+    working_directory: ~/marp-cli
+    steps:
+      - checkout
+      - setup_remote_docker
+
+      - run:
+          name: Build Docker image
+          command: docker build --no-cache -t marpteam/marp-cli:latest .
+
+      - run:
+          name: Push to Docker Hub
+          command: |
+            docker login -u $DOCKER_USER -p $DOCKER_PASS
+            docker push marpteam/marp-cli:latest
+
 workflows:
   version: 2
   build:
     jobs:
       - 8.11.4
       - 6.14.2
+      - docker-image:
+          requires:
+            - 8.11.4
+            - 6.14.2
+          filters:
+            branches:
+              only: master

.dockerignore

@@ -0,0 +1,8 @@
+**/*
+!src/
+!LICENSE
+!marp-cli.js
+!package.json
+!rollup.config.js
+!tsconfig.json
+!yarn.lock

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- Add official Docker image ([#14](https://github.com/marp-team/marp-cli/pull/14))
+
 ## v0.0.7 - 2018-09-06
 
 ### Changed

Dockerfile

@@ -0,0 +1,28 @@
+FROM node:8.11.4-alpine
+LABEL maintainer "Marp team"
+
+RUN apk update && apk upgrade && \
+    echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories && \
+    echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories && \
+    apk add --no-cache \
+      grep \
+      chromium@edge \
+      freetype@edge \
+      harfbuzz@edge \
+      nss@edge
+
+RUN addgroup -S marp && adduser -S -g marp marp \
+    && mkdir -p /home/marp/app /home/marp/.cli \
+    && chown -R marp:marp /home/marp
+
+USER marp
+ENV IS_DOCKER true
+
+WORKDIR /home/marp/.cli
+COPY --chown=marp:marp . /home/marp/.cli/
+RUN yarn install && yarn build \
+    && rm -rf ./src ./node_modules && yarn install --production && yarn cache clean
+
+WORKDIR /home/marp/app
+ENTRYPOINT ["node", "/home/marp/.cli/marp-cli.js"]
+CMD ["--help"]

README.md

@@ -13,6 +13,8 @@ It can convert Marp / Marpit Markdown files into static HTML (and CSS).
 
 ## Try it now!
 
+### npx
+
 [npx](https://blog.npmjs.org/post/162869356040/introducing-npx-an-npm-package-runner) is the best tool when you want to convert Markdown right now. Just run below if you are installed [Node.js](https://nodejs.org/) >= 8.2.0:
 
 ```bash
@@ -27,6 +29,18 @@ npx @marp-team/marp-cli slide-deck.md -o output.pdf
 
 > :information_source: You have to install [Google Chrome](https://www.google.com/chrome/) (or [Chromium](https://www.chromium.org/)) to convert slide deck into PDF.
 
+### Docker
+
+Do you hate to install node/chrome locally? We have [an official Docker image](https://hub.docker.com/r/marpteam/marp-cli/) ready to use CLI.
+
+```bash
+# Convert slide deck into HTML
+docker run --rm -v $PWD:/home/marp/app/ marpteam/marp-cli slide-deck.md
+
+# Convert slide deck into PDF by using Chromium in Docker
+docker run --rm -v $PWD:/home/marp/app/ marpteam/marp-cli slide-deck.md --pdf
+```
+
 ## Install
 
 ### Global install

src/converter.ts

@@ -144,11 +144,16 @@ export class Converter {
   }
 
   private static runBrowser() {
+    const args: string[] = []
     const finder: () => string[] = require('is-wsl')
       ? chromeFinder.wsl
       : chromeFinder[process.platform]
 
+    if (process.env.IS_DOCKER)
+      args.push('--no-sandbox', '--disable-dev-shm-usage')
+
     return puppeteer.launch({
+      args,
       executablePath: finder ? finder()[0] : undefined,
     })
   }