From 9a7dbd0b9ec356e30542cc7f389b9c9d4b775bc8 Mon Sep 17 00:00:00 2001
From: Felipe Cecagno <fcecagno@gmail.com>
Date: Fri, 3 Aug 2018 14:47:52 -0300
Subject: [PATCH] remove nginx from build; add labels for traefik; expose port
on bbb-webrtc-sfu
---
labs/bbb-webrtc-sfu/Dockerfile | 2 ++
labs/docker/Makefile | 2 --
labs/docker/docker-compose.yml | 43 +++++++---------------------------
3 files changed, 11 insertions(+), 36 deletions(-)
diff --git a/labs/bbb-webrtc-sfu/Dockerfile b/labs/bbb-webrtc-sfu/Dockerfile
index b0cfd9d4f1..ebba290ee6 100644
--- a/labs/bbb-webrtc-sfu/Dockerfile
+++ b/labs/bbb-webrtc-sfu/Dockerfile
@@ -12,4 +12,6 @@ RUN cd /source \
WORKDIR /source
+EXPOSE 3008
+
CMD [ "docker-entrypoint.sh" ]
diff --git a/labs/docker/Makefile b/labs/docker/Makefile
index edce0913fe..a6ff02a929 100644
--- a/labs/docker/Makefile
+++ b/labs/docker/Makefile
@@ -52,7 +52,5 @@ release:
make image DIR=$(BUILD_DIR_BASE)/bbb-webhooks IMAGE_NAME=bbb-webhooks
make image DIR=$(BUILD_DIR_BASE)/labs/docker/kurento IMAGE_NAME=bbb-kurento
make image DIR=$(BUILD_DIR_BASE)/labs/docker/freeswitch IMAGE_NAME=bbb-freeswitch
- make image DIR=$(BUILD_DIR_BASE)/labs/docker/nginx IMAGE_NAME=bbb-nginx
- make image DIR=$(BUILD_DIR_BASE)/labs/docker/nginx-dhp IMAGE_NAME=nginx-dhp
make image DIR=$(BUILD_DIR_BASE)/labs/docker/coturn IMAGE_NAME=bbb-coturn
make image DIR=$(BUILD_DIR_BASE)/bbb-lti IMAGE_NAME=bbb-lti
diff --git a/labs/docker/docker-compose.yml b/labs/docker/docker-compose.yml
index d012f61893..fabf9da3a1 100644
--- a/labs/docker/docker-compose.yml
+++ b/labs/docker/docker-compose.yml
@@ -32,6 +32,9 @@ services:
environment:
REDIS_HOST: redis
SHARED_SECRET: ${SHARED_SECRET}
+ labels:
+ - "traefik.backend=bbb-webhooks"
+ - "traefik.frontend.rule=PathPrefix: /bigbluebutton/api/hooks"
bbb-freeswitch:
image: ${TAG_PREFIX}bbb-freeswitch${TAG_SUFFIX}
@@ -40,6 +43,9 @@ services:
- coturn
volumes:
- media-audio:/var/freeswitch/meetings
+ labels:
+ - "traefik.backend=bbb-freeswitch"
+ - "traefik.frontend.rule=PathPrefix: /ws"
bbb-webrtc-sfu:
image: ${TAG_PREFIX}bbb-webrtc-sfu${TAG_SUFFIX}
@@ -54,6 +60,9 @@ services:
REDIS_HOST: redis
FREESWITCH_IP: bbb-freeswitch
LOG_LEVEL: debug
+ labels:
+ - "traefik.backend=bbb-webrtc-sfu"
+ - "traefik.frontend.rule=PathPrefix: /bbb-webrtc-sfu"
coturn:
image: ${TAG_PREFIX}bbb-coturn${TAG_SUFFIX}
@@ -118,40 +127,6 @@ services:
- "traefik.backend=bbb-web"
- "traefik.frontend.rule=PathPrefix: /bigbluebutton"
-# greenlight-env:
-# image: bigbluebutton/greenlight
-# volumes:
-# - config-greenlight:/data
-# command: rake secret > /data/env
-
-# greenlight:
-# image: bigbluebutton/greenlight
-# restart: unless-stopped
-# volumes:
-# - db-greenlight:/usr/src/app/db/production
-
- nginx:
- image: ${TAG_PREFIX}bbb-nginx${TAG_SUFFIX}
- restart: unless-stopped
- depends_on:
- - bbb-webhooks
- - bbb-web
- - bbb-html5
- - bbb-webrtc-sfu
- - bbb-freeswitch
-# - greenlight
- ports:
- - 80:80
- - 443:443
- volumes:
- - ssl-conf:/etc/nginx/ssl
- - static:/var/www/bigbluebutton-default
- environment:
- SERVER_DOMAIN: ${SERVER_DOMAIN}
- SSL_CERT_PATH: /etc/nginx/ssl/live/${SERVER_DOMAIN}/fullchain.pem
- SSL_KEY_PATH: /etc/nginx/ssl/live/${SERVER_DOMAIN}/privkey.pem
- SSL_DHPARAM_PATH: /etc/nginx/ssl/dhp-2048.pem
-
traefik:
image: traefik
restart: unless-stopped
--
GitLab