diff options
author | enahum <nahumhbl@gmail.com> | 2016-09-15 09:35:44 -0300 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-09-15 08:35:44 -0400 |
commit | b180bb46e3034d0ce75c9961a8ccea3eefbc855c (patch) | |
tree | 10cfc7affeca5b7c7634b73daf7817cc0c71cfd0 /Makefile | |
parent | 3b4c9d7588e061b865dd5e35e785919962875fb9 (diff) | |
download | chat-b180bb46e3034d0ce75c9961a8ccea3eefbc855c.tar.gz chat-b180bb46e3034d0ce75c9961a8ccea3eefbc855c.tar.bz2 chat-b180bb46e3034d0ce75c9961a8ccea3eefbc855c.zip |
PLT-3412 WebRTC Server side & System Console (#3706)
* WebRTC Server side
* WebRTC System Console
* Consistency on variable names
* Add turn and stun uri validation
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 25 |
1 files changed, 23 insertions, 2 deletions
@@ -96,6 +96,14 @@ start-docker: sleep 10; \ fi + @if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 0 ]; then \ + echo starting mattermost-webrtc; \ + docker run --name mattermost-webrtc -p 7088:7088 -p 7089:7089 -p 8188:8188 -p 8189:8189 -d mattermost/webrtc:latest > /dev/null; \ + elif [ $(shell docker ps | grep -ci mattermost-webrtc) -eq 0 ]; then \ + echo restarting mattermost-webrtc; \ + docker start mattermost-webrtc > /dev/null; \ + fi + stop-docker: @echo Stopping docker containers @@ -114,6 +122,11 @@ stop-docker: docker stop mattermost-openldap > /dev/null; \ fi + @if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 1 ]; then \ + echo stopping mattermost-webrtc; \ + docker stop mattermost-webrtc > /dev/null; \ + fi + clean-docker: @echo Removing docker containers @@ -135,6 +148,12 @@ clean-docker: docker rm -v mattermost-openldap > /dev/null; \ fi + @if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 1 ]; then \ + echo removing mattermost-webrtc; \ + docker stop mattermost-webrtc > /dev/null; \ + docker rm -v mattermost-webrtc > /dev/null; \ + fi + check-client-style: @echo Checking client style @@ -184,6 +203,7 @@ ifeq ($(BUILD_ENTERPRISE_READY),true) $(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/saml && ./saml.test -test.v -test.timeout=60s -test.coverprofile=csaml.out || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/cluster && ./cluster.test -test.v -test.timeout=60s -test.coverprofile=ccluster.out || exit 1 $(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/account_migration && ./account_migration.test -test.v -test.timeout=60s -test.coverprofile=caccount_migration.out || exit 1 + $(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/webrtc && ./webrtc.test -test.v -test.timeout=60s -test.coverprofile=cwebrtc.out || exit 1 tail -n +2 cldap.out >> ecover.out tail -n +2 ccompliance.out >> ecover.out @@ -191,14 +211,15 @@ ifeq ($(BUILD_ENTERPRISE_READY),true) tail -n +2 csaml.out >> ecover.out tail -n +2 ccluster.out >> ecover.out tail -n +2 caccount_migration.out >> ecover.out - rm -f cldap.out ccompliance.out cemoji.out csaml.out ccluster.out caccount_migration.out - + tail -n +2 cwebrtc.out >> ecover.out + rm -f cldap.out ccompliance.out cemoji.out csaml.out ccluster.out caccount_migration.out cwebrtc.out rm -r ldap.test rm -r compliance.test rm -r emoji.test rm -r saml.test rm -r cluster.test rm -r account_migration.test + rm -r webrtc.test rm -f config/*.crt rm -f config/*.key endif |