formatting, documentation and config updates

Author: gegere

Dockerfile

@@ -1,5 +1,7 @@
 FROM htmlgraphic/base
 MAINTAINER Jason Gegere <jason@htmlgraphic.com>
+ARG VCS_REF
+ARG BUILD_DATE
 
 # Install packages then remove cache package list information
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \

Makefile

@@ -1,7 +1,7 @@
 # Build a container via the command "make build"
 # By Jason Gegere <jason@htmlgraphic.com>
 
-VERSION 			= 1.1.4
+VERSION 		= 1.1.5
 NAME				= postfix
 IMAGE_REPO 	= htmlgraphic
 IMAGE_NAME 	= $(IMAGE_REPO)/$(NAME)
@@ -27,15 +27,18 @@ help:
 
 build:
 	@echo "Build image $(IMAGE_NAME):$(VERSION)"
-	docker build --rm --no-cache -t $(IMAGE_NAME):$(VERSION) .
+	docker build --rm --no-cache \
+        --build-arg VCS_REF=`git rev-parse --short HEAD` \
+        --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+        --rm -t $(IMAGE_NAME):$(VERSION) -t $(IMAGE_NAME):$(VERSION) .
 
 push:
 	@echo "note: If the repository is set as an automatted build you will NOT be able to push"
 	docker push $(IMAGE_NAME):$(VERSION)
 
 run:
 	@echo "Run $(NAME)..."
-	docker-compose up -d
+	docker-compose -f docker-compose.yml up -d
 
 start:
 	@echo "Starting $(NAME)..."

README.md

@@ -1,21 +1,23 @@
-##Quick Start
+## Quick Start
 ```bash
 	$ git clone https://github.com/htmlgraphic/Postfix.git && cd Postfix
 	$ make
 	$ make build
 ```
 
-##Postfix Docker
+## Postfix Docker
 
-Postfix is a very nice mail courier service, I enjoy using. This repo will give you a turn key, fully functional build of a Docker container for use in production or your dev environment.
+Postfix is a very nice mail courier service, enjoyed by many. This repo will give you a turn key, fully functional build of a Docker container for use in production or your dev environment.
+
+[![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/)
 
 ---
 
 If you found this repo you are probably looking into Docker or already have knowledge as to what Docker can help you with. In this repo you will find a number of complete Dockerfile builds used in **development** and **production** environments. Listed below are the types of systems available and an explanation of each file.
 
-###Repo Breakdown
+### Repo Breakdown
 
-#####Test Driven Development
+##### Test Driven Development
 
 **[CircleCI](https://circleci.com/gh/htmlgraphic/Postfix)** - Test the Dockerfile process, can the container be built the correctly? Verify the build process with a number of tests. Currently with this service no code can be tested on the running container. Data can be echo and available grepping the output via `docker logs | grep value`
 
@@ -27,7 +29,7 @@ If you found this repo you are probably looking into Docker or already have know
 [![Build Status](https://api.shippable.com/projects/54986113d46935d5fbc0d2ec/badge?branchName=master)](https://app.shippable.com/projects/54986113d46935d5fbc0d2ec/builds/latest) 
 
 
-####Postfix Container - Build Breakdown
+#### Postfix Container - Build Breakdown
 * **app/preseed.txt** - Params used on initial Postfix setup
 * **app/run.sh** - Setup apache, move around conf files, start process on container
 * **app/supervisord.conf** - Supervisor is a client/server system that allows its users to monitor and control a number of processes on UNIX-like operating systems

tutum.yml renamed to docker-cloud.yml

@@ -12,7 +12,7 @@ postfix:
     - NODE_ENVIRONMENT=production
     - SASL_PASS=password
     - SASL_USER=username
-    - SMTP_ALLOW_IP="104.236.9.145 50.28.0.151 54.225.164.191 184.60.94.26 104.236.40.133 107.170.0.0/18 10.7.0.0/16"
+    - SMTP_ALLOW_IP=192.168.0.1 192.168.0.2 192.168.0.3
   tags:
-    - prod
+    - production
   target_num_containers: 3

docker-compose.yml

@@ -1,14 +1,16 @@
-postfix:
-  image: htmlgraphic/postfix:latest
-  container_name: postfix
-  ports:
-    - "25:25"
-  restart: always
-  environment:
-    - DOMAIN=htmlgraphic.com
-    - HOST=post-office
-    - LOG_TOKEN=$LOG_ENTRIES_TOKEN
-    - NODE_ENVIRONMENT=production
-    - SASL_PASS=password
-    - SASL_USER=username
-    - SMTP_ALLOW_IP="104.236.9.145 50.28.0.151 54.225.164.191 184.60.94.26 104.236.40.133 107.170.0.0/18 10.7.0.0/16"
+version: "3"
+services:
+  postfix:
+    image: htmlgraphic/postfix:latest
+    container_name: postfix
+    ports:
+      - "25:25"
+    restart: always
+    environment:
+      - DOMAIN=htmlgraphic.com
+      - HOST=post-office
+      - LOG_TOKEN=$LOG_ENTRIES_TOKEN
+      - NODE_ENVIRONMENT=production
+      - SASL_PASS=password
+      - SASL_USER=username
+      - SMTP_ALLOW_IP=192.168.0.1 192.168.0.2 192.168.0.3