summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-10-13 15:04:46 -0300
committerJoram Wilander <jwawilander@gmail.com>2016-10-13 14:04:46 -0400
commitf555f104c1aca3d94dffa2eb7683971ee6ac236f (patch)
treecec4f6d13e38dda19051f88ecb8cc20891b64ff8 /Makefile
parentc902a0a773f1162e57034a193278136922c494ec (diff)
downloadchat-f555f104c1aca3d94dffa2eb7683971ee6ac236f.tar.gz
chat-f555f104c1aca3d94dffa2eb7683971ee6ac236f.tar.bz2
chat-f555f104c1aca3d94dffa2eb7683971ee6ac236f.zip
Make tests pass without internet connection (#4211)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ba8321b67..6eb2ed53c 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ start-docker:
docker start mattermost-postgres > /dev/null; \
fi
+ifeq ($(BUILD_ENTERPRISE_READY),true)
@echo Ldap test user test.one
@if [ $(shell docker ps -a | grep -ci mattermost-openldap) -eq 0 ]; then \
echo starting mattermost-openldap; \
@@ -106,6 +107,7 @@ start-docker:
echo restarting mattermost-webrtc; \
docker start mattermost-webrtc > /dev/null; \
fi
+endif
stop-docker:
@echo Stopping docker containers