diff --git a/Dockerfile b/Dockerfile index 62220e0..dc414df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13 AS builder +FROM golang:1.16 AS builder RUN apt-get update && apt-get install -y python3 WORKDIR /workdir @@ -6,7 +6,7 @@ WORKDIR /workdir COPY . . RUN make build -FROM alpine:3.11 +FROM alpine:3.13 ENV CONFIG=/config/server.conf RUN adduser -D spreedbackend && \ diff --git a/docker-compose.yml b/docker-compose.yml index e4b0150..37c66d0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - janus - coturn nats: - image: nats:2.1 + image: nats:2.2.1 volumes: - ./gnatsd.conf:/config/gnatsd.conf command: ["-c", "/config/gnatsd.conf"] diff --git a/docker/coturn/Dockerfile b/docker/coturn/Dockerfile index e178bce..3dbd306 100644 --- a/docker/coturn/Dockerfile +++ b/docker/coturn/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.13 RUN apk add --no-cache coturn diff --git a/docker/janus/Dockerfile b/docker/janus/Dockerfile index fb964b0..65dcd53 100644 --- a/docker/janus/Dockerfile +++ b/docker/janus/Dockerfile @@ -1,12 +1,13 @@ # Modified from https://gitlab.com/powerpaul17/nc_talk_backend/-/blob/dcbb918d8716dad1eb72a889d1e6aa1e3a543641/docker/janus/Dockerfile -FROM alpine:3.11 +FROM alpine:3.13 RUN apk add --no-cache curl autoconf automake libtool pkgconf build-base \ glib-dev libconfig-dev libnice-dev jansson-dev openssl-dev zlib libsrtp-dev \ - gengetopt libwebsockets-dev git + gengetopt libwebsockets-dev git curl-dev libogg-dev # usrsctp -ARG USRSCTP_VERSION=4069ba5b9587bd7c99d964756b527d6259f0d3da +# 29 Mar 2021 +ARG USRSCTP_VERSION=70d42ae95a1de83bd317c8cc9503f894671d1392 RUN cd /tmp && \ git clone https://github.com/sctplab/usrsctp && \ @@ -16,9 +17,20 @@ RUN cd /tmp && \ ./configure --prefix=/usr && \ make && make install +# libsrtp +RUN cd /tmp && \ + wget https://github.com/cisco/libsrtp/archive/v2.3.0.tar.gz && \ + tar xfv v2.3.0.tar.gz && \ + cd libsrtp-2.3.0 && \ + ./configure --prefix=/usr --enable-openssl && \ + make shared_library && \ + make install && \ + rm -fr /libsrtp-2.3.0 && \ + rm -f /v2.3.0.tar.gz + # JANUS -ARG JANUS_VERSION=0.9.2 +ARG JANUS_VERSION=0.11.1 RUN mkdir -p /usr/src/janus && \ cd /usr/src/janus && \ curl -L https://github.com/meetecho/janus-gateway/archive/v$JANUS_VERSION.tar.gz | tar -xz && \