summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2017-03-26 10:37:18 -0300
committerJoram Wilander <jwawilander@gmail.com>2017-03-26 09:37:18 -0400
commit230556f0f7bde3b6ffa2c6cbd3ca7404fcf3023e (patch)
tree621914e5e684fd89460a4244552509a3f5c12105 /Makefile
parentea74613444c65e965a76a6ad7640f6c011c2c69b (diff)
downloadchat-230556f0f7bde3b6ffa2c6cbd3ca7404fcf3023e.tar.gz
chat-230556f0f7bde3b6ffa2c6cbd3ca7404fcf3023e.tar.bz2
chat-230556f0f7bde3b6ffa2c6cbd3ca7404fcf3023e.zip
PLT-6046 remove webrtc from tests (#5872)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 0 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 0d998d741..64393ac2a 100644
--- a/Makefile
+++ b/Makefile
@@ -90,14 +90,6 @@ start-docker:
docker start mattermost-postgres > /dev/null; \
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
-
@if [ $(shell docker ps -a | grep -ci mattermost-inbucket) -eq 0 ]; then \
echo starting mattermost-inbucket; \
docker run --name mattermost-inbucket -p 9000:10080 -p 2500:10025 -d jhillyerd/inbucket:latest > /dev/null; \
@@ -148,11 +140,6 @@ 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
-
@if [ $(shell docker ps -a | grep -ci mattermost-inbucket) -eq 1 ]; then \
echo stopping mattermost-inbucket; \
docker stop mattermost-inbucket > /dev/null; \
@@ -179,12 +166,6 @@ 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
-
@if [ $(shell docker ps -a | grep -ci mattermost-inbucket) -eq 1 ]; then \
echo removing mattermost-inbucket; \
docker stop mattermost-inbucket > /dev/null; \