diff --git a/.gitignore b/.gitignore index f5782e2..40e9b7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ domain scripts/python/config.py +server.crt +server.csr +server.key* diff --git a/Makefile b/Makefile index d989e76..0724513 100644 --- a/Makefile +++ b/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 diff --git a/mongod/Dockerfile b/mongod/Dockerfile index 68a0aa0..abde0da 100644 --- a/mongod/Dockerfile +++ b/mongod/Dockerfile @@ -1,8 +1,6 @@ # MongoDB container -FROM phusion/baseimage:0.9.16 - -MAINTAINER MLstate +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 diff --git a/opa/Dockerfile b/opa/Dockerfile index 61a42c5..f6e703b 100644 --- a/opa/Dockerfile +++ b/opa/Dockerfile @@ -1,8 +1,6 @@ # Generic Opa container -FROM phusion/baseimage:0.9.16 - -MAINTAINER MLstate +FROM phusion/baseimage:0.10.1 # Install stuff we need RUN apt-get update && apt-get install -y \ diff --git a/peps/Dockerfile b/peps/Dockerfile index d39c904..03eddec 100644 --- a/peps/Dockerfile +++ b/peps/Dockerfile @@ -3,8 +3,6 @@ # Based on our generic opa container which has mlstatelibs and node built in. FROM opa:latest -MAINTAINER MLstate - # 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 diff --git a/smtpin/Dockerfile b/smtpin/Dockerfile index ad4d232..0ff3792 100644 --- a/smtpin/Dockerfile +++ b/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 diff --git a/smtpout/Dockerfile b/smtpout/Dockerfile index ad4d232..0ff3792 100644 --- a/smtpout/Dockerfile +++ b/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