Skip to content

Commit

Permalink
Merge pull request #74 from marp-team/downgrade-puppeteer-in-docker
Browse files Browse the repository at this point in the history
Fix hanging PDF conversion within Docker image
  • Loading branch information
yhatt authored Feb 17, 2019
2 parents fcec056 + 5240c06 commit f764757
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Fixed

- Fix hanging PDF conversion within Docker image ([#73](https://github.com/marp-team/marp-cli/issues/73), [#74](https://github.com/marp-team/marp-cli/pull/74))

## v0.6.1 - 2019-02-04

### Changed
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10.14.1-alpine
FROM node:10.15.1-alpine
LABEL maintainer "Marp team"

RUN apk update && apk upgrade && \
Expand Down Expand Up @@ -27,7 +27,7 @@ ENV IS_DOCKER true

WORKDIR /home/marp/.cli
COPY --chown=marp:marp . /home/marp/.cli/
RUN yarn install && yarn build \
RUN yarn install && yarn add puppeteer-core@chrome-71 && yarn build \
&& rm -rf ./src ./node_modules && yarn install --production && yarn cache clean

WORKDIR /home/marp/app
Expand Down

0 comments on commit f764757

Please sign in to comment.