MM 7971 dockerhost -> localhost && docker -> docker-compose (#10872)

* replace dockerhost with localhost

* remove uneeded setup-max build step (no more dockerhost)

* changes as recommended by @cpanato

* make clean-docker with docker-compose

* added ports to docker-compose.yml (needed for osx).   ignore error for ldapadd (when already exists)

* add clean-old-docker to legacy.mk

* docker-compose stop instead of down for `make stop-docker`
Этот коммит содержится в:
scott lee davis
2019-08-02 10:53:00 -04:00
коммит произвёл Jesse Hallam
родитель e4582905ea
Коммит 2fa63b10ec
16 изменённых файлов: 112 добавлений и 205 удалений

Просмотреть файл

@@ -5,6 +5,8 @@ services:
restart: always
networks:
- mm-test
ports:
- "3306:3306"
environment:
MYSQL_ROOT_HOST: "%"
MYSQL_ROOT_PASSWORD: mostest
@@ -19,6 +21,8 @@ services:
restart: always
networks:
- mm-test
ports:
- "5432:5432"
environment:
POSTGRES_USER: mmuser
POSTGRES_PASSWORD: mostest
@@ -29,6 +33,8 @@ services:
command: "server /data"
networks:
- mm-test
ports:
- "9000:9000"
environment:
MINIO_ACCESS_KEY: minioaccesskey
MINIO_SECRET_KEY: miniosecretkey
@@ -38,11 +44,18 @@ 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"
@@ -55,6 +68,9 @@ 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"
@@ -63,7 +79,8 @@ services:
image: redis
networks:
- mm-test
ports:
- "6379:6379"
start_dependencies:
image: mattermost/mattermost-wait-for-dep:latest
networks: