external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v5.0.29

Browse source
This commit is contained in:
winlin 2022-06-15 19:32:31 +08:00
parent d525d27e64
commit f568e4f91d
6 changed files with 68 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/Dockerfile
View file

@ -14,9 +14,10 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y gcc make g++ patch unzip perl git
# Build and install SRS.
# Note that SRT is enabled by default, so we configure without --srt=on.
COPY . /srs
WORKDIR /srs/trunk
RUN ./configure --srt=on --jobs=${JOBS} && make -j${JOBS} && make install
RUN ./configure --jobs=${JOBS} && make -j${JOBS} && make install
# All config files for SRS.
RUN cp -R conf /usr/local/srs/conf && \

22
trunk/Dockerfile.builds
View file

@ -1,15 +1,15 @@
########################################################
FROM ossrs/srs:dev AS centos7-baseline
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 && make -j2
RUN cd /srs/trunk && ./configure --jobs=2 --srt=off && make -j2
FROM ossrs/srs:dev AS centos7-no-webrtc
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 --rtc=off && make -j2
RUN cd /srs/trunk && ./configure --jobs=2 --srt=off --rtc=off && make -j2
FROM ossrs/srs:dev AS centos7-no-asm
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 --nasm=off --srtp-nasm=off && make -j2
RUN cd /srs/trunk && ./configure --jobs=2 --srt=off --nasm=off --srtp-nasm=off && make -j2
FROM ossrs/srs:dev AS centos7-srt
COPY . /srs
@ -17,17 +17,21 @@ RUN cd /srs/trunk && ./configure --jobs=2 --srt=on && make -j2
FROM ossrs/srs:dev AS centos7-ansi-no-ffmpeg
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 --cxx11=off --cxx14=off --ffmpeg-fit=off && make -j2
RUN cd /srs/trunk && ./configure --jobs=2 --srt=off --cxx11=off --cxx14=off --ffmpeg-fit=off && make -j2
########################################################
FROM ossrs/srs:dev6 AS centos6-baseline
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 --cxx11=off --cxx14=off && make -j2
RUN cd /srs/trunk && ./configure --jobs=2 --srt=off --cxx11=off --cxx14=off && make -j2
FROM ossrs/srs:dev6 AS centos6-srt
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 --srt=on --cxx11=off --cxx14=off && make -j2
########################################################
FROM ossrs/srs:dev8 AS centos8-baseline
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 && make -j2
RUN cd /srs/trunk && ./configure --jobs=2 --srt=off && make -j2
FROM ossrs/srs:dev8 AS centos8-srt
COPY . /srs
@ -36,7 +40,7 @@ RUN cd /srs/trunk && ./configure --jobs=2 --srt=on && make -j2
########################################################
FROM ossrs/srs:ubuntu16 AS ubuntu16-baseline
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 && make -j2
RUN cd /srs/trunk && ./configure --jobs=2 --srt=off && make -j2
FROM ossrs/srs:ubuntu16 AS ubuntu16-srt
COPY . /srs
@ -45,7 +49,7 @@ RUN cd /srs/trunk && ./configure --jobs=2 --srt=on && make -j2
########################################################
FROM ossrs/srs:ubuntu18 AS ubuntu18-baseline
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 && make -j2
RUN cd /srs/trunk && ./configure --jobs=2 --srt=off && make -j2
FROM ossrs/srs:ubuntu18 AS ubuntu18-srt
COPY . /srs
@ -54,7 +58,7 @@ RUN cd /srs/trunk && ./configure --jobs=2 --srt=on && make -j2
########################################################
FROM ossrs/srs:ubuntu20 AS ubuntu20-baseline
COPY . /srs
RUN cd /srs/trunk && ./configure --jobs=2 && make -j2
RUN cd /srs/trunk && ./configure --jobs=2 --srt=off && make -j2
FROM ossrs/srs:ubuntu20 AS ubuntu20-srt
COPY . /srs

1
trunk/doc/CHANGELOG.md
View file

@ -8,6 +8,7 @@ The changelog for SRS.
## SRS 5.0 Changelog
* v5.0, 2022-06-15, For [#3058](https://github.com/ossrs/srs/pull/3058): Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v5.0.29
* v5.0, 2022-04-04, Support NGINX HLS Cluster, see [CN](https://github.com/ossrs/srs/wiki/v4_CN_SampleHlsCluster) or [EN](https://github.com/ossrs/srs/wiki/v4_EN_SampleHlsCluster). v5.0.28
* v5.0, 2022-03-30, Support DigitalOcean [Droplet SRS 1-Click](https://cloud.digitalocean.com/droplets/new?appId=104916642&size=s-1vcpu-1gb&region=sgp1&image=ossrs-srs&type=applications). v5.0.27
* v5.0, 2022-03-12, Merge [#2943](https://github.com/ossrs/srs/pull/2943): SRT: Fix typo in libsrt build options. v5.0.26

2
trunk/src/core/srs_core_version5.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 0
#define VERSION_REVISION 28
#define VERSION_REVISION 29
#endif