From 4734215a114ef7fd7dcf4ccf3f72a7568b170229 Mon Sep 17 00:00:00 2001
From: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
Date: Tue, 6 Aug 2019 14:33:40 +0200
Subject: [PATCH] fix port extensions (#11806)

* using override instead of extend

* revert and move the port allocation

* add new line
---
 build/docker-compose.yml                  | 19 +------------------
 docker-compose.yml => docker-compose.yaml | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 18 deletions(-)
 rename docker-compose.yml => docker-compose.yaml (81%)

diff --git a/build/docker-compose.yml b/build/docker-compose.yml
index 3ae01b48dc..9cd8386ecd 100644
--- a/build/docker-compose.yml
+++ b/build/docker-compose.yml
@@ -5,8 +5,6 @@ services:
     restart: always
     networks:
       - mm-test
-    ports:
-      - "3306:3306"
     environment:
       MYSQL_ROOT_HOST: "%"
       MYSQL_ROOT_PASSWORD: mostest
@@ -21,8 +19,6 @@ services:
     restart: always
     networks:
       - mm-test
-    ports:
-      - "5432:5432"
     environment:
       POSTGRES_USER: mmuser
       POSTGRES_PASSWORD: mostest
@@ -33,8 +29,6 @@ services:
     command: "server /data"
     networks:
       - mm-test
-    ports:
-      - "9000:9000"
     environment:
       MINIO_ACCESS_KEY: minioaccesskey
       MINIO_SECRET_KEY: miniosecretkey
@@ -44,18 +38,11 @@ services:
     restart: always
     networks:
       - mm-test
-    ports:
-      - "10025:10025"
-      - "10080:10080"
-      - "10110:10110"
   openldap:
     image: "osixia/openldap:1.2.2"
     restart: always
     networks:
       - mm-test
-    ports:
-      - "389:389"
-      - "636:636"
     environment:
       LDAP_TLS_VERIFY_CLIENT: "never"
       LDAP_ORGANISATION: "Mattermost Test"
@@ -65,9 +52,6 @@ services:
     image: "mattermost/mattermost-elasticsearch-docker:6.5.1"
     networks:
       - mm-test
-    ports:
-      - "9200:9200"
-      - "9300:9300"
     environment:
       http.host: "0.0.0.0"
       transport.host: "127.0.0.1"
@@ -76,8 +60,7 @@ services:
     image: redis
     networks:
       - mm-test
-    ports:
-      - "6379:6379"
+
   start_dependencies:
     image: mattermost/mattermost-wait-for-dep:latest
     networks:
diff --git a/docker-compose.yml b/docker-compose.yaml
similarity index 81%
rename from docker-compose.yml
rename to docker-compose.yaml
index a1a026a163..29f7aad6a8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yaml
@@ -2,36 +2,54 @@ version: '2.4'
 services:
   mysql:
     container_name: mattermost-mysql
+    ports:
+      - "3306:3306"
     extends:
         file: build/docker-compose.yml
         service: mysql
   postgres:
     container_name: mattermost-postgres
+    ports:
+      - "5432:5432"
     extends:
         file: build/docker-compose.yml
         service: postgres
   minio:
     container_name: mattermost-minio
+    ports:
+      - "9000:9000"
     extends:
         file: build/docker-compose.yml
         service: minio
   inbucket:
     container_name: mattermost-inbucket
+    ports:
+      - "10025:10025"
+      - "10080:10080"
+      - "10110:10110"
     extends:
         file: build/docker-compose.yml
         service: inbucket
   openldap:
     container_name: mattermost-openldap
+    ports:
+      - "389:389"
+      - "636:636"
     extends:
         file: build/docker-compose.yml
         service: openldap
   elasticsearch:
     container_name: mattermost-elasticsearch
+    ports:
+      - "9200:9200"
+      - "9300:9300"
     extends:
         file: build/docker-compose.yml
         service: elasticsearch
   redis:
     container_name: mattermost-redis
+    ports:
+      - "6379:6379"
     extends:
         file: build/docker-compose.yml
         service: redis