Add gitlab and flesh out redis sentinel in docker-compose.yml

terramar-labs · Oct 6, 2017 · 24f1abb · 24f1abb
1 parent 2afdf92
commit 24f1abb
Show file tree

Hide file tree

Showing 5 changed files with 1,738 additions and 30 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,32 +1,49 @@
 version: '2'
 services:
-    web:
-        image: webdevops/php-nginx:7.1
-        volumes:
-            - .:/app
-            - ./docker/nginx/vhost.common.d/vhost.common.conf:/opt/docker/etc/nginx/vhost.common.d/10-location-root.conf
-        links:
-            - redis-sentinel
-            - redis-master
-            - redis-slave
-        environment:
-            - WEB_DOCUMENT_ROOT=/app/web
-        ports:
-          - "127.0.0.1:80:80"
-    redis-master:
-      image: redis:3.2
-    redis-slave:
-      image: redis:3.2
-      command: redis-server --slaveof redis-master 6379
-      links:
-        - redis-master
-    redis-sentinel:
-      image: erichsu/redis-sentinel
-      environment:
-        - SENTINEL_DOWN_AFTER=5000
-        - SENTINEL_FAILOVER=5000
-      links:
-        - redis-master
-        - redis-slave:slave
-    mailhog:
-        image: mailhog/mailhog
+  web:
+    image: webdevops/php-nginx:7.1
+    volumes:
+      - .:/app
+      - ./docker/nginx/vhost.common.d/vhost.common.conf:/opt/docker/etc/nginx/vhost.common.d/10-location-root.conf
+    links:
+      - redis-master
+#      - redis-slave      # Uncomment to start a slave Redis container
+#      - gitlab           # Uncomment to start a GitLab CE container (starts mailhog, too)
+    environment:
+      - WEB_DOCUMENT_ROOT=/app/web
+    ports:
+      - "127.0.0.1:80:80"   # Access Packages in your browser at http://127.0.0.1:80
+      - "127.0.0.1:443:443" # Access Packages in your browser at https://127.0.0.1:443
+  redis-master:
+    image: redis:3.2
+    volumes:
+      - ./docker/redis/sentinel.conf:/etc/redis/sentinel.conf.orig
+      - ./docker/redis/entrypoint_master.sh:/entrypoint.sh
+    command: /entrypoint.sh
+    expose:
+      - "26379"
+      - "6379"
+  redis-slave:
+    image: redis:3.2
+    volumes:
+      - ./docker/redis/sentinel.conf:/etc/redis/sentinel.conf.orig
+      - ./docker/redis/entrypoint_slave.sh:/entrypoint.sh
+    command: /entrypoint.sh
+    links:
+      - redis-master
+    expose:
+      - "26379"
+      - "6379"
+  gitlab:
+    image: gitlab/gitlab-ce:9.5.8-ce.0
+    volumes:
+      - ./docker/gitlab/gitlab.rb:/etc/gitlab/gitlab.rb
+    links:
+      - redis-master
+      - mailhog
+    ports:
+      - "127.0.0.1:8082:80" # Access GitLab in your browser at http://127.0.0.1:8082
+  mailhog:
+    image: mailhog/mailhog
+    ports:
+      - "127.0.0.1:8025:8025" # Access MailHog UI in your browser at http://127.0.0.1:8025