Tweak docker compose setup (#11785)

* fix stray dockerhost mention

* fix stray whitespace

* fix missing mattermost-redix cleanup in clean-old-docker

* absolute path to docker-compose, plus simpler ldap initialization

* allow ldapadd to fail on CI

Makefile

@@ -117,7 +117,7 @@ ifeq ($(IS_CI),false)
 	@echo Starting docker containers
 
 	docker-compose --no-ansi -f ./build/docker-compose.yml run --rm start_dependencies
-	docker-compose --no-ansi -f ./build/docker-compose.yml exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest -f /${LDAP_DATA}-data.ldif || true';
+	cat tests/${LDAP_DATA}-data.ldif | docker-compose --no-ansi -f ./build/docker-compose.yml exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest || true';
 
 else
 	@echo CI Build: skipping docker start

app/plugin_test.go

@@ -336,7 +336,7 @@ func TestPluginSync(t *testing.T) {
 			func(cfg *model.Config) {
 				s3Host := os.Getenv("CI_MINIO_HOST")
 				if s3Host == "" {
-					s3Host = "dockerhost"
+					s3Host = "localhost"
 				}
 
 				s3Port := os.Getenv("CI_MINIO_PORT")

build/Jenkinsfile.pr

@@ -131,12 +131,12 @@ pipeline {
             }
 
             steps {
-                dir('src/github.com/mattermost/mattermost-server/build') {
+                dir('src/github.com/mattermost/mattermost-server') {
                     ansiColor('xterm') {
                         sh """
-                            docker-compose --no-ansi run --rm start_dependencies
-                            docker-compose --no-ansi ps
-                            docker-compose --no-ansi exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest -f /${LDAP_DATA}-data.ldif';
+                        /usr/local/bin/docker-compose --no-ansi -f ./build/docker-compose.yml run --rm start_dependencies
+                        /usr/local/bin/docker-compose --no-ansi -f ./build/docker-compose.yml ps
+                        cat tests/${LDAP_DATA}-data.ldif | /usr/local/bin/docker-compose --no-ansi -f ./build/docker-compose.yml exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
                         """
                     }
                 }
@@ -297,7 +297,7 @@ pipeline {
                         docker-compose logs --tail="all" -t --no-color > docker-compose_logs
                         docker ps -a --no-trunc > docker_ps
                         docker stats -a --no-stream > docker_stats
-                        tar -czvf docker_logs.tar.gz docker-compose_logs docker_ps docker_stats 
+                        tar -czvf docker_logs.tar.gz docker-compose_logs docker_ps docker_stats
 
                         docker-compose --no-ansi down -v
                     """

build/docker-compose.yml

@@ -61,9 +61,6 @@ services:
       LDAP_ORGANISATION: "Mattermost Test"
       LDAP_DOMAIN: "mm.test.com"
       LDAP_ADMIN_PASSWORD: "mostest"
-    volumes:
-      - "../tests/test-data.ldif:/test-data.ldif"
-      - "../tests/qa-data.ldif:/qa-data.ldif"
   elasticsearch:
     image: "mattermost/mattermost-elasticsearch-docker:6.5.1"
     networks:

build/legacy.mk

@@ -56,3 +56,8 @@ clean-old-docker:
 		docker rm -v mattermost-elasticsearch > /dev/null; \
 	fi
 
+	@if [ $(shell docker ps -a | grep -ci mattermost-redis) -eq 1 ]; then \
+		echo removing mattermost-redis; \
+		docker stop mattermost-redis > /dev/null; \
+		docker rm -v mattermost-redis > /dev/null; \
+	fi