Skip to content

Commit

Permalink
New upstream version 4.5.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
misi committed Mar 2, 2019
2 parents 9a84f5f + 5e61bea commit 952c2f6
Show file tree
Hide file tree
Showing 39 changed files with 1,379 additions and 49 deletions.
16 changes: 16 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
02/03/2019 Oleg Moskalenko <[email protected]> Mihály Mészáros <[email protected]>
Version 4.5.1.1 'dan Eider':
- merge PR #330 missing \r\n after http Connection:close (by gribunin)
- merge PR #303 fix typo enpoint (by Majid Motallebikashani)
- merge PR #129 seperate http web-admin listener (by Thibaut ACKERMANN)
- regression from 4.5.1.0
* readd pwd check
* add to config missing web-admin-listen-on-workers option
- merge docker branch
* Add Docker file for all database backend.
- merge sparc64 branch
* Fix mem alingment issue on 64 bit architecture
That issue caused earlier "bus error" on sparc64 and armhf
- merge PR #336 Clarify Debian install (by David-dp-)
- merge PR #339 RPM build fix (by Peter Hudec )

24/11/2018 Oleg Moskalenko <[email protected]> Mihály Mészáros <[email protected]>
Version 4.5.1.0 'dan Eider':
Consider to change config file after upgrade, because it contains some
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
libsqlite3-dev \
libevent-dev \
g++ \
libboost-dev \
libevent-dev
libboost-dev
4 changes: 3 additions & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ At the present time, several operation systems have this project pre-packaged:

http://packages.qa.debian.org/r/coturn.html

If you are using the Debian package from the project download site,
which can be installed the usual way: apt install coturn

If instead you are using the Debian package from the project download site,
then follow these instructions:

Unpack the archive:
Expand Down
2 changes: 1 addition & 1 deletion README.turnserver
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ Options with values:
--web-admin-port=<port> Web-admin server port. Default is 8080.
--web-admin-listen-on-workers Enable for web-admin server to listens on STUN/TURN workers STUN/TURN ports.
By default it is disabled for security resons!
(This beahvior used to be the default bahavior, and was enabled by default.)
(This behavior used to be the default behavior, and was enabled by default.)

--ne=[1|2|3] Set network engine type for the process (for internal purposes).

Expand Down
19 changes: 19 additions & 0 deletions docker/README.docker
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Before you begin
* copy db schema run ./cp_schema.sh
* edit turnserver/turnserver.cfg according your db selection (mysql or postgresql or redis or mongodb)

# start

docker-compose -f docker-compose-all.yml up --build --detach

# restart
Notice: May restart needed for coturn container, if it could not access database yet, due initialization delay.
docker restart docker_coturn_1

# stop
docker-compose -f docker-compose-all.yml down


# Or Stop with volume removal
docker-compose down --volumes

70 changes: 70 additions & 0 deletions docker/coturn/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
### 1. stage: create build image
FROM debian:stable AS coturn-build

ENV BUILD_PREFIX /usr/local/src

# Install build dependencies
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y build-essential git debhelper dpkg-dev libssl-dev libevent-dev sqlite3 libsqlite3-dev postgresql-client libpq-dev default-mysql-client default-libmysqlclient-dev libhiredis-dev libmongoc-dev libbson-dev

# Clone coTURN
WORKDIR ${BUILD_PREFIX}
RUN git clone https://github.com/coturn/coturn.git

# Build coTURN
WORKDIR coturn
RUN ./configure
RUN make

### 2. stage: create production image

FROM debian:stable AS coturn

ENV INSTALL_PREFIX /usr/local
ENV BUILD_PREFIX /usr/local/src
ENV TURNSERVER_GROUP turnserver
ENV TURNSERVER_USER turnserver

COPY --from=coturn-build ${BUILD_PREFIX}/coturn/bin/ ${INSTALL_PREFIX}/bin/
COPY --from=coturn-build ${BUILD_PREFIX}/coturn/man/ ${INSTALL_PREFIX}/man/
#COPY turnserver.conf ${INSTALL_PREFIX}/etc
COPY --from=coturn-build ${BUILD_PREFIX}/coturn/sqlite/turndb ${INSTALL_PREFIX}/var/db/turndb
COPY --from=coturn-build ${BUILD_PREFIX}/coturn/turndb ${INSTALL_PREFIX}/turndb
# Install lib dependencies
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y libc6>=2.15 libevent-core-2.0-5>=2.0.10-stable libevent-extra-2.0-5>=2.0.10-stable libevent-openssl-2.0-5>=2.0.10-stable libevent-pthreads-2.0-5>=2.0.10-stable libhiredis0.13>=0.13.1 libmariadbclient18>=5.5.36 libpq5>=8.4~ libsqlite3-0>=3.6.0 libssl1.1>=1.1.0 libmongoc-1.0 libbson-1.0
RUN apt-get install -y mysql-client postgresql-client redis-tools mongodb-clients

RUN if ! getent group "$TURNSERVER_GROUP" >/dev/null; then \
addgroup --system "$TURNSERVER_GROUP" || exit 1 ;\
fi \
&& \
if ! getent passwd "$TURNSERVER_USER" >/dev/null; then \
adduser --system \
--home / \
--shell /bin/false \
--no-create-home \
--ingroup "$TURNSERVER_GROUP" \
--disabled-password \
--disabled-login \
--gecos "turnserver daemon" \
"$TURNSERVER_USER" || exit 1; \
fi


# set startup parameters
# SUTN/TURN PORTS
EXPOSE 3478 3479 3478/udp 3479/udp 80 80/udp
EXPOSE 5349 5350 5349/udp 5350/udp 443 443/udp
# CLI
EXPOSE 5766
# Relay Ports
EXPOSE 49152-65535 49152-65535/udp

#COPY ./docker-entrypoint.sh /
#ENTRYPOINT ["/docker-entrypoint.sh"]

WORKDIR ${INSTALL_PREFIX}
CMD ${INSTALL_PREFIX}/bin/turnserver
1 change: 1 addition & 0 deletions docker/coturn/coturn.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# for future usage
Loading

0 comments on commit 952c2f6

Please sign in to comment.