From b2386ddacbd7ef9ad3b0c2d86bf8c22f7b440d9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Fri, 6 Jan 2017 13:10:15 +0100
Subject: [PATCH] changed README, added docker-compos-build.yml, fixed postgres
 volume

---
 README.md                | 26 ++++++++++++++--------
 docker-compose-build.yml | 48 ++++++++++++++++++++++++++++++++++++++++
 docker-compose.yml       | 28 +++++++++++------------
 3 files changed, 79 insertions(+), 23 deletions(-)
 create mode 100644 docker-compose-build.yml

diff --git a/README.md b/README.md
index dea1d25..365129f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-Welcome to Zammad
-=================
+# Welcome to Zammad
 
 Zammad is a web based open source helpdesk/ticket system with many features
 to manage customer communication via several channels like telephone, facebook,
@@ -8,19 +7,28 @@ twitter, chat and e-mails. It is distributed under the GNU AFFERO General Public
 10.x. Do you receive many e-mails and want to answer them with a team of agents?
 You're going to love Zammad!
 
-What is zammad-docker-compose repo for?
-----------------------------------------
+## What is zammad-docker-compose repo for?
 
 This repo is meant to be the starting point for somebody who likes to test zammad.
 If you like to run zammad in production you should use one of the DEB or RPM packages.
 
-Getting started with zammad-docker-compose
-------------------------------------------
+## Getting started with zammad-docker-compose
+
+* git clone git@github.com:monotek/zammad-docker-compose.git
+* cd zammad-docker-compose
+
+### Setting vm.max_map_count for Elasticsearch
 
 * sysctl -w vm.max_map_count=262144
-* docker-compose up --build
 
-Docs
-----
+### Using DockerHub images
+
+* docker-compose up
+
+### Building locally
+
+* docker-compose -f docker-compose-build.yml up --build
+
+## Docs
 
 https://docs.zammad.org/en/latest/contributing-install-docker.html
diff --git a/docker-compose-build.yml b/docker-compose-build.yml
new file mode 100644
index 0000000..89ccce3
--- /dev/null
+++ b/docker-compose-build.yml
@@ -0,0 +1,48 @@
+version: '2'
+services:
+  elasticsearch:
+    build:
+      context: .
+      dockerfile: Dockerfile.elasticsearch
+    volumes:
+      - data-elasticsearch:/var/lib/elasticsearch
+  nginx:
+    build:
+      context: .
+      dockerfile: Dockerfile.nginx
+    ports:
+      - "80:80"
+    links:
+      - zammad
+    depends_on:
+      - zammad
+    volumes:
+      - data-zammad:/home/zammad
+  postgresql:
+    build:
+      context: .
+      dockerfile: Dockerfile.postgresql
+    volumes:
+      - data-postgresql:/var/lib/postgresql
+  zammad:
+    build:
+      context: .
+      dockerfile: Dockerfile.zammad
+    links:
+      - postgresql
+      - elasticsearch
+    depends_on:
+      - postgresql
+      - elasticsearch
+    volumes:
+      - data-zammad:/home/zammad
+      - data-ruby:/usr/local
+volumes:
+  data-elasticsearch:
+    driver: local
+  data-postgresql:
+    driver: local
+  data-ruby:
+    driver: local
+  data-zammad:
+    driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index ecbff7a..b06443c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,23 @@
 version: '2'
 services:
-  postgresql:
-    image: monotek/zammad-docker-compose:postgresql
-    volumes:
-      - data-postgresql:/var/lib/psql
   elasticsearch:
     image: monotek/zammad-docker-compose:elasticsearch
     volumes:
       - data-elasticsearch:/var/lib/elasticsearch
+  nginx:
+    image: monotek/zammad-docker-compose:nginx
+    ports:
+      - "80:80"
+    links:
+      - zammad
+    depends_on:
+      - zammad
+    volumes:
+      - data-zammad:/home/zammad
+  postgresql:
+    image: monotek/zammad-docker-compose:postgresql
+    volumes:
+      - data-postgresql:/var/lib/postgresql
   zammad:
     image: monotek/zammad-docker-compose:zammad
     links:
@@ -19,16 +29,6 @@ services:
     volumes:
       - data-zammad:/home/zammad
       - data-ruby:/usr/local
-  nginx:
-    image: monotek/zammad-docker-compose:nginx
-    ports:
-      - "80:80"
-    links:
-      - zammad
-    depends_on:
-      - zammad
-    volumes:
-      - data-zammad:/home/zammad
 volumes:
   data-elasticsearch:
     driver: local