fix(containers): Update containers to fix dependencies versions

.gitignore

@@ -1,2 +1,5 @@
 domain
 scripts/python/config.py
+server.crt
+server.csr
+server.key*

Makefile

@@ -3,9 +3,10 @@
 
 HOSTNAME?=$(shell cat hostname)
 DOMAIN_NAME=$(shell cat domain)
-MONGO_DATA=/data/db
-SOLR_DATA=/data/solr
-PEPS_ETC=/etc/peps
+MONGO_DATA ?= /data/db
+SOLR_DATA ?= /data/solr
+# On MacOS, use /private/etc/peps to keep configuration in /etc
+PEPS_ETC ?= /etc/peps
 
 # Public ports
 HTTPS_PORT?=443

mongod/Dockerfile

@@ -1,8 +1,6 @@
 # MongoDB container
 
-FROM phusion/baseimage:0.9.16
-
-MAINTAINER MLstate <[email protected]>
+FROM phusion/baseimage:0.10.1
 
 # Add 10gen official apt source to the sources list.
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10

opa/Dockerfile

@@ -1,8 +1,6 @@
 # Generic Opa container
 
-FROM phusion/baseimage:0.9.16
-
-MAINTAINER MLstate <[email protected]>
+FROM phusion/baseimage:0.10.1
 
 # Install stuff we need
 RUN apt-get update && apt-get install -y \

peps/Dockerfile

@@ -3,8 +3,6 @@
 # Based on our generic opa container which has mlstatelibs and node built in.
 FROM opa:latest
 
-MAINTAINER MLstate <[email protected]>
-
 # Download the peps executable
 RUN curl -sf -o /tmp/peps.zip -L https://github.com/MLstate/PEPS/releases/download/0.9.9/peps.zip
 RUN mkdir -p /peps && cd /peps && unzip -q /tmp/peps.zip

smtpin/Dockerfile

@@ -1,7 +1,7 @@
-FROM node:6.7
+FROM node:6
 
 # Install Haraka
-RUN npm install -g Haraka@1.4.0
+RUN npm install -g Haraka
 RUN haraka -i /usr/local/haraka
 
 # Copy package.json for plugin dependencies

smtpout/Dockerfile

@@ -1,7 +1,7 @@
-FROM node:6.7
+FROM node:6
 
 # Install Haraka
-RUN npm install -g Haraka@1.4.0
+RUN npm install -g Haraka
 RUN haraka -i /usr/local/haraka
 
 # Copy package.json for plugin dependencies