From a0b7e341c13adcc559b5199de00395302e96c494 Mon Sep 17 00:00:00 2001
From: Marvin Steadfast <marvin@xsteadfastx.org>
Date: Thu, 2 Nov 2017 07:57:17 +0000
Subject: [PATCH] removed pandoc from deps

---
 writing_env/Dockerfile                        | 26 -------------------
 .../root/home/blog/playbooks/writing_env.yml  |  4 ++-
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/writing_env/Dockerfile b/writing_env/Dockerfile
index ab2055e..9f34b3e 100644
--- a/writing_env/Dockerfile
+++ b/writing_env/Dockerfile
@@ -6,37 +6,11 @@ ENV SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt
 ENV BLOG_UID 1000
 ENV BLOG_GID 1000
 
-ENV PANDOC_VERSION 1.19.2.1
-
 # prepare repositories
 RUN set -ex \
  && echo "http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
  && 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 root /
 
diff --git a/writing_env/root/home/blog/playbooks/writing_env.yml b/writing_env/root/home/blog/playbooks/writing_env.yml
index 9c2384c..04fb24d 100644
--- a/writing_env/root/home/blog/playbooks/writing_env.yml
+++ b/writing_env/root/home/blog/playbooks/writing_env.yml
@@ -10,12 +10,12 @@
         state=present
         update_cache=yes
       with_items:
+        #- g++
         - ack
         - ansible
         - ca-certificates
         - coreutils
         - curl
-        #- g++
         - gcc
         - git
         - grep
@@ -23,6 +23,7 @@
         - lftp
         - make
         - musl-dev
+        - nodejs
         - python3
         - python3-dev
         - wget
@@ -50,6 +51,7 @@
         - jinja2-slug
         - markdown
         - pelican==3.7.1
+        - typogrify
         - tzlocal
         - virtualenv
       become: yes