Resolve conflicts

This commit is contained in:
Fred Dixon 2018-08-31 09:23:32 -05:00
commit 19fe6ae173

View File

@ -7,6 +7,9 @@ RUN apt-get update && apt-get install -y wget
RUN echo "deb http://ubuntu.bigbluebutton.org/xenial-200 bigbluebutton-xenial main " | tee /etc/apt/sources.list.d/bigbluebutton.list RUN echo "deb http://ubuntu.bigbluebutton.org/xenial-200 bigbluebutton-xenial main " | tee /etc/apt/sources.list.d/bigbluebutton.list
RUN wget http://ubuntu.bigbluebutton.org/repo/bigbluebutton.asc -O- | apt-key add - RUN wget http://ubuntu.bigbluebutton.org/repo/bigbluebutton.asc -O- | apt-key add -
RUN apt-get update && apt-get install -y wget software-properties-common
RUN add-apt-repository ppa:jonathonf/ffmpeg-4 -y
RUN apt-get update && apt-get -y dist-upgrade RUN apt-get update && apt-get -y dist-upgrade
# -- Setup tomcat7 to run under docker # -- Setup tomcat7 to run under docker
@ -30,7 +33,7 @@ RUN apt-get install -y bigbluebutton
RUN apt-get install -y bbb-demo RUN apt-get install -y bbb-demo
# -- Install mongodb (for HTML5 client) # -- Install mongodb (for HTML5 client)
RUN sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
RUN echo "deb [ arch=amd64,arm64 ] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list RUN echo "deb [ arch=amd64,arm64 ] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
RUN sudo apt-get update && sudo apt-get install -y mongodb-org curl RUN sudo apt-get update && sudo apt-get install -y mongodb-org curl
@ -44,6 +47,9 @@ RUN apt-get update && apt-get install -y nodejs
# -- Install HTML5 client # -- Install HTML5 client
RUN apt-get install -y bbb-html5 RUN apt-get install -y bbb-html5
RUN apt-get update
RUN apt-get install -y coturn vim
# -- Install supervisor to run all the BigBlueButton processes (replaces systemd) # -- Install supervisor to run all the BigBlueButton processes (replaces systemd)
RUN apt-get install -y supervisor RUN apt-get install -y supervisor
RUN mkdir -p /var/log/supervisor RUN mkdir -p /var/log/supervisor
@ -51,6 +57,7 @@ ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
# -- Modify FreeSWITCH event_socket.conf.xml to listen to IPV4 # -- Modify FreeSWITCH event_socket.conf.xml to listen to IPV4
ADD mod/event_socket.conf.xml /opt/freeswitch/etc/freeswitch/autoload_configs ADD mod/event_socket.conf.xml /opt/freeswitch/etc/freeswitch/autoload_configs
ADD mod/external.xml /opt/freeswitch/conf/sip_profiles/external.xml
# -- Finish startup # -- Finish startup
ADD setup.sh /root/setup.sh ADD setup.sh /root/setup.sh