Skip to content

Commit 367d6a1

Browse files
committed
formatting, documentation and config updates
1 parent 1d221d2 commit 367d6a1

File tree

5 files changed

+34
-25
lines changed

5 files changed

+34
-25
lines changed

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM htmlgraphic/base
22
MAINTAINER Jason Gegere <jason@htmlgraphic.com>
3+
ARG VCS_REF
4+
ARG BUILD_DATE
35

46
# Install packages then remove cache package list information
57
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build a container via the command "make build"
22
# By Jason Gegere <jason@htmlgraphic.com>
33

4-
VERSION = 1.1.4
4+
VERSION = 1.1.5
55
NAME = postfix
66
IMAGE_REPO = htmlgraphic
77
IMAGE_NAME = $(IMAGE_REPO)/$(NAME)
@@ -27,15 +27,18 @@ help:
2727

2828
build:
2929
@echo "Build image $(IMAGE_NAME):$(VERSION)"
30-
docker build --rm --no-cache -t $(IMAGE_NAME):$(VERSION) .
30+
docker build --rm --no-cache \
31+
--build-arg VCS_REF=`git rev-parse --short HEAD` \
32+
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
33+
--rm -t $(IMAGE_NAME):$(VERSION) -t $(IMAGE_NAME):$(VERSION) .
3134

3235
push:
3336
@echo "note: If the repository is set as an automatted build you will NOT be able to push"
3437
docker push $(IMAGE_NAME):$(VERSION)
3538

3639
run:
3740
@echo "Run $(NAME)..."
38-
docker-compose up -d
41+
docker-compose -f docker-compose.yml up -d
3942

4043
start:
4144
@echo "Starting $(NAME)..."

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
##Quick Start
1+
## Quick Start
22
```bash
33
$ git clone https://github.com/htmlgraphic/Postfix.git && cd Postfix
44
$ make
55
$ make build
66
```
77

8-
##Postfix Docker
8+
## Postfix Docker
99

10-
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.
10+
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.
11+
12+
[![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/)
1113

1214
---
1315

1416
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.
1517

16-
###Repo Breakdown
18+
### Repo Breakdown
1719

18-
#####Test Driven Development
20+
##### Test Driven Development
1921

2022
**[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`
2123

@@ -27,7 +29,7 @@ If you found this repo you are probably looking into Docker or already have know
2729
[![Build Status](https://api.shippable.com/projects/54986113d46935d5fbc0d2ec/badge?branchName=master)](https://app.shippable.com/projects/54986113d46935d5fbc0d2ec/builds/latest)
2830

2931

30-
####Postfix Container - Build Breakdown
32+
#### Postfix Container - Build Breakdown
3133
* **app/preseed.txt** - Params used on initial Postfix setup
3234
* **app/run.sh** - Setup apache, move around conf files, start process on container
3335
* **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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ postfix:
1212
- NODE_ENVIRONMENT=production
1313
- SASL_PASS=password
1414
- SASL_USER=username
15-
- 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"
15+
- SMTP_ALLOW_IP=192.168.0.1 192.168.0.2 192.168.0.3
1616
tags:
17-
- prod
17+
- production
1818
target_num_containers: 3

docker-compose.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
postfix:
2-
image: htmlgraphic/postfix:latest
3-
container_name: postfix
4-
ports:
5-
- "25:25"
6-
restart: always
7-
environment:
8-
- DOMAIN=htmlgraphic.com
9-
- HOST=post-office
10-
- LOG_TOKEN=$LOG_ENTRIES_TOKEN
11-
- NODE_ENVIRONMENT=production
12-
- SASL_PASS=password
13-
- SASL_USER=username
14-
- 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"
1+
version: "3"
2+
services:
3+
postfix:
4+
image: htmlgraphic/postfix:latest
5+
container_name: postfix
6+
ports:
7+
- "25:25"
8+
restart: always
9+
environment:
10+
- DOMAIN=htmlgraphic.com
11+
- HOST=post-office
12+
- LOG_TOKEN=$LOG_ENTRIES_TOKEN
13+
- NODE_ENVIRONMENT=production
14+
- SASL_PASS=password
15+
- SASL_USER=username
16+
- SMTP_ALLOW_IP=192.168.0.1 192.168.0.2 192.168.0.3

0 commit comments

Comments
 (0)