diff --git a/Dockerfile b/Dockerfile index 06c9f25710dc4698dccf4f5652796fe197e17c50..8a44a2389d7a8c19489249dbe0b3157aa17f4658 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,51 +1,40 @@ -FROM alpine:edge +FROM modjular/alpine-edge:v1 LABEL maintainer "Jeffrey Phillips Freeman <the@jeffreyfreeman.me>" -COPY docker-entrypoint.sh /docker-entrypoint.sh -RUN mkdir /docker-entrypoint.d -COPY 30-add-host-ip-entry.sh /docker-entrypoint.d/30-add-host-ip-entry.sh -COPY docker-run.sh /docker-run.sh -RUN mkdir -p /docker-run.d - ARG UID=1000 ARG GID=1000 RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories -#RUN apk update && apk upgrade - -RUN apk add --no-cache \ - pandoc \ - graphviz \ - chromium \ - nss \ - freetype \ - freetype-dev \ - harfbuzz \ - ca-certificates \ - ttf-freefont \ - font-fira-code \ - nodejs \ - yarn \ - make \ - plantuml \ - py3-pip \ - qpdf - -# commands from - -# install LaTeX -# Parts of this file are copied from https://github.com/pandoc/dockerfiles -RUN apk --no-cache add \ - freetype \ - fontconfig \ - gnupg \ - gzip \ - librsvg \ - perl \ - tar \ - wget \ - xz +RUN apk update && \ + apk --no-cache upgrade && \ + apk add --no-cache \ + pandoc \ + graphviz \ + chromium \ + nss \ + freetype \ + freetype-dev \ + harfbuzz \ + ca-certificates \ + ttf-freefont \ + font-fira-code \ + nodejs \ + yarn \ + make \ + plantuml \ + py3-pip \ + qpdf + freetype \ + fontconfig \ + gnupg \ + gzip \ + librsvg \ + perl \ + tar \ + wget \ + xz + # DANGER: this will vary for different distributions, particularly the # `linuxmusl` suffix. Alpine linux is a musl libc based distribution, for other # "more common" distributions, you likely want just `-linux` suffix rather than @@ -102,6 +91,3 @@ RUN apk add --no-cache alpine-sdk sudo \ USER pptruser WORKDIR /home/pptruser COPY src/puppeteerConfigFile.json /home/pptruser/.puppeteer.json - -ENTRYPOINT [ "/docker-entrypoint.sh" ] -CMD [ "/docker-run.sh" ]