Update Docker components (#78)

Updates to Docker build:
* Alpine 1.13,
* usrsctp 70d42ae95a1de83bd317c8cc9503f894671d1392
* libsrtp 2.3.0
* Janus 0.11.1
* Added libogg-dev
* Nats 2.2.1
* golang 1.16

Co-authored-by: root <root@kleener.eu>
This commit is contained in:
kleener 2021-04-15 08:21:20 +02:00 committed by GitHub
parent 048b3b2f7d
commit fab080f16a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 8 deletions

View File

@ -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 RUN apt-get update && apt-get install -y python3
WORKDIR /workdir WORKDIR /workdir
@ -6,7 +6,7 @@ WORKDIR /workdir
COPY . . COPY . .
RUN make build RUN make build
FROM alpine:3.11 FROM alpine:3.13
ENV CONFIG=/config/server.conf ENV CONFIG=/config/server.conf
RUN adduser -D spreedbackend && \ RUN adduser -D spreedbackend && \

View File

@ -12,7 +12,7 @@ services:
- janus - janus
- coturn - coturn
nats: nats:
image: nats:2.1 image: nats:2.2.1
volumes: volumes:
- ./gnatsd.conf:/config/gnatsd.conf - ./gnatsd.conf:/config/gnatsd.conf
command: ["-c", "/config/gnatsd.conf"] command: ["-c", "/config/gnatsd.conf"]

View File

@ -1,4 +1,4 @@
FROM alpine:3.11 FROM alpine:3.13
RUN apk add --no-cache coturn RUN apk add --no-cache coturn

View File

@ -1,12 +1,13 @@
# Modified from https://gitlab.com/powerpaul17/nc_talk_backend/-/blob/dcbb918d8716dad1eb72a889d1e6aa1e3a543641/docker/janus/Dockerfile # 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 \ 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 \ 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 # usrsctp
ARG USRSCTP_VERSION=4069ba5b9587bd7c99d964756b527d6259f0d3da # 29 Mar 2021
ARG USRSCTP_VERSION=70d42ae95a1de83bd317c8cc9503f894671d1392
RUN cd /tmp && \ RUN cd /tmp && \
git clone https://github.com/sctplab/usrsctp && \ git clone https://github.com/sctplab/usrsctp && \
@ -16,9 +17,20 @@ RUN cd /tmp && \
./configure --prefix=/usr && \ ./configure --prefix=/usr && \
make && make install 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 # JANUS
ARG JANUS_VERSION=0.9.2 ARG JANUS_VERSION=0.11.1
RUN mkdir -p /usr/src/janus && \ RUN mkdir -p /usr/src/janus && \
cd /usr/src/janus && \ cd /usr/src/janus && \
curl -L https://github.com/meetecho/janus-gateway/archive/v$JANUS_VERSION.tar.gz | tar -xz && \ curl -L https://github.com/meetecho/janus-gateway/archive/v$JANUS_VERSION.tar.gz | tar -xz && \