Merge branch 'master' into release

Author: jackycute

hackmd/Dockerfile

@@ -1,10 +1,9 @@
-FROM node:boron-wheezy
+FROM node:boron
 ENV DEBIAN_FRONTEND noninteractive
 RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
 	wget -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - && \
 	apt-get update && \
-	apt-get install -y git postgresql-client-9.4 && \
-	apt-get clean && apt-get purge && rm -r /var/lib/apt/lists/*
+	apt-get install -y git postgresql-client-9.6 build-essential
 
 # source
 RUN mkdir /hackmd
@@ -24,6 +23,13 @@ ADD docker-entrypoint.sh /hackmd/docker-entrypoint.sh
 # build front-end bundle
 RUN npm run build:prod
 
+# remove dev dependencies
+RUN npm prune --production
+
+# remove build dependencies
+RUN apt-get remove -y --auto-remove build-essential && \
+	apt-get clean && apt-get purge && rm -r /var/lib/apt/lists/*
+
 EXPOSE 3000
 
 CMD ["/bin/bash", "/hackmd/docker-entrypoint.sh"]

hackmd/config.json

@@ -1,6 +1,7 @@
 {
     "production": {
         "urladdport": true,
+        "email": true,
         "db": {
             "username": "hackmd",
             "password": "hackmdpass",