From 01c1c10ca4b9927bb43dc5c9bf2ed7042e817bc7 Mon Sep 17 00:00:00 2001
From: 18601673727 <18601673727@163.com>
Date: Thu, 28 Apr 2016 15:28:00 +0800
Subject: [PATCH] amend last commit

---
 docker-compose.yml | 161 +++++++++++++++++++++++----------------------
 1 file changed, 82 insertions(+), 79 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a91b7ada..d3dfbc0e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,83 +1,86 @@
-postgresql:
-  restart: always
-  image: sameersbn/postgresql:9.4-20
-  environment:
-    - DB_USER=gitlab
-    - DB_PASS=password
-    - DB_NAME=gitlabhq_production
-    - DB_EXTENSION=pg_trgm
-  volumes:
-    - /srv/docker/gitlab/postgresql:/var/lib/postgresql
-  networks:
-    - gitlab-tier
+version: '2'
 
-redis:
-  restart: always
-  image: sameersbn/redis:latest
-  volumes:
-    - /srv/docker/gitlab/redis:/var/lib/redis
-  networks:
-    - gitlab-tier
-
-gitlab:
-  container_name: gitlab-main
-  restart: always
-  image: sameersbn/gitlab:8.7.0
-  depends_on:
-    - redis
-    - postgresql
-  ports:
-    - "10080:80"
-    - "10022:22"
-  environment:
-    - DEBUG=false
-    - TZ=Asia/Kolkata
-    - GITLAB_TIMEZONE=Kolkata
-
-    - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
-
-    - DB_HOST=postgresql
-    - DB_USER=gitlab
-    - DB_NAME=gitlabhq_production
-    - DB_PASS=password
-    - DB_ADAPTER=postgresql
-    - REDIS_HOST=redis
-
-    - GITLAB_HOST=localhost
-    - GITLAB_PORT=10080
-    - GITLAB_SSH_PORT=10022
-    - GITLAB_RELATIVE_URL_ROOT=
-
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
-    - GITLAB_EMAIL=notifications@example.com
-    - GITLAB_EMAIL_REPLY_TO=noreply@example.com
-    - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
-
-    - GITLAB_BACKUP_SCHEDULE=daily
-    - GITLAB_BACKUP_TIME=01:00
-
-    - SMTP_ENABLED=false
-    - SMTP_DOMAIN=www.example.com
-    - SMTP_HOST=smtp.gmail.com
-    - SMTP_PORT=587
-    - SMTP_USER=mailer@example.com
-    - SMTP_PASS=password
-    - SMTP_STARTTLS=true
-    - SMTP_AUTHENTICATION=login
-
-    - IMAP_ENABLED=false
-    - IMAP_HOST=imap.gmail.com
-    - IMAP_PORT=993
-    - IMAP_USER=mailer@example.com
-    - IMAP_PASS=password
-    - IMAP_SSL=true
-    - IMAP_STARTTLS=false
-  volumes:
-    - /srv/docker/gitlab/gitlab:/home/git/data
-  networks:
-    - gitlab-tier
+services:
+  postgresql:
+    restart: always
+    image: sameersbn/postgresql:9.4-20
+    environment:
+      - DB_USER=gitlab
+      - DB_PASS=password
+      - DB_NAME=gitlabhq_production
+      - DB_EXTENSION=pg_trgm
+    volumes:
+      - /srv/docker/gitlab/postgresql:/var/lib/postgresql
+    networks:
+      - gitlab-tier
+  
+  redis:
+    restart: always
+    image: sameersbn/redis:latest
+    volumes:
+      - /srv/docker/gitlab/redis:/var/lib/redis
+    networks:
+      - gitlab-tier
+  
+  gitlab:
+    container_name: gitlab-main
+    restart: always
+    image: sameersbn/gitlab:8.7.0
+    depends_on:
+      - redis
+      - postgresql
+    ports:
+      - "10080:80"
+      - "10022:22"
+    environment:
+      - DEBUG=false
+      - TZ=Asia/Kolkata
+      - GITLAB_TIMEZONE=Kolkata
+  
+      - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string
+  
+      - DB_HOST=postgresql
+      - DB_USER=gitlab
+      - DB_NAME=gitlabhq_production
+      - DB_PASS=password
+      - DB_ADAPTER=postgresql
+      - REDIS_HOST=redis
+  
+      - GITLAB_HOST=localhost
+      - GITLAB_PORT=10080
+      - GITLAB_SSH_PORT=10022
+      - GITLAB_RELATIVE_URL_ROOT=
+  
+      - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
+      - GITLAB_NOTIFY_PUSHER=false
+  
+      - GITLAB_EMAIL=notifications@example.com
+      - GITLAB_EMAIL_REPLY_TO=noreply@example.com
+      - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com
+  
+      - GITLAB_BACKUP_SCHEDULE=daily
+      - GITLAB_BACKUP_TIME=01:00
+  
+      - SMTP_ENABLED=false
+      - SMTP_DOMAIN=www.example.com
+      - SMTP_HOST=smtp.gmail.com
+      - SMTP_PORT=587
+      - SMTP_USER=mailer@example.com
+      - SMTP_PASS=password
+      - SMTP_STARTTLS=true
+      - SMTP_AUTHENTICATION=login
+  
+      - IMAP_ENABLED=false
+      - IMAP_HOST=imap.gmail.com
+      - IMAP_PORT=993
+      - IMAP_USER=mailer@example.com
+      - IMAP_PASS=password
+      - IMAP_SSL=true
+      - IMAP_STARTTLS=false
+    volumes:
+      - /srv/docker/gitlab/gitlab:/home/git/data
+    networks:
+      - gitlab-tier
 
 networks:
   gitlab-tier: