removed pandoc from deps

This commit is contained in:
Marvin Steadfast 2017-11-02 07:57:17 +00:00
parent 7c24858bbb
commit a0b7e341c1
2 changed files with 3 additions and 27 deletions

View File

@ -6,37 +6,11 @@ ENV SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt
ENV BLOG_UID 1000 ENV BLOG_UID 1000
ENV BLOG_GID 1000 ENV BLOG_GID 1000
ENV PANDOC_VERSION 1.19.2.1
# prepare repositories # prepare repositories
RUN set -ex \ RUN set -ex \
&& echo "http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ && echo "http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
&& apk update && apk update
# install pandoc
RUN set -ex \
&& apk add --virtual .buildDeps \
ghc \
cabal \
linux-headers \
musl-dev \
zlib-dev \
curl \
&& mkdir /tmp/pandoc \
&& cd /tmp/pandoc \
&& curl -fsSL "https://hackage.haskell.org/package/pandoc-$PANDOC_VERSION/pandoc-$PANDOC_VERSION.tar.gz" | tar -xzf - \
&& cd "/tmp/pandoc/pandoc-$PANDOC_VERSION" \
&& cabal update \
&& cabal install --only-dependencies \
&& cabal configure --prefix=/usr/local \
&& cabal build \
&& cabal copy \
&& cd / \
&& rm -rf /tmp/pandoc \
&& rm -rf /root/.cabal \
&& rm -rf /root/.ghc \
&& apk del .buildDeps
# add files # add files
ADD root / ADD root /

View File

@ -10,12 +10,12 @@
state=present state=present
update_cache=yes update_cache=yes
with_items: with_items:
#- g++
- ack - ack
- ansible - ansible
- ca-certificates - ca-certificates
- coreutils - coreutils
- curl - curl
#- g++
- gcc - gcc
- git - git
- grep - grep
@ -23,6 +23,7 @@
- lftp - lftp
- make - make
- musl-dev - musl-dev
- nodejs
- python3 - python3
- python3-dev - python3-dev
- wget - wget
@ -50,6 +51,7 @@
- jinja2-slug - jinja2-slug
- markdown - markdown
- pelican==3.7.1 - pelican==3.7.1
- typogrify
- tzlocal - tzlocal
- virtualenv - virtualenv
become: yes become: yes