mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Merge 5.0.100, v5.0-a1 into develop.
This commit is contained in:
commit
fa177679a6
13 changed files with 1088 additions and 108 deletions
|
@ -19,15 +19,6 @@ FROM ossrs/srs:dev-cache AS centos7-ansi-no-ffmpeg
|
|||
COPY . /srs
|
||||
RUN cd /srs/trunk && ./configure --srt=off --gb28181=off --cxx11=off --cxx14=off --ffmpeg-fit=off && make
|
||||
|
||||
########################################################
|
||||
FROM ossrs/srs:dev6-cache AS centos6-baseline
|
||||
COPY . /srs
|
||||
RUN cd /srs/trunk && ./configure --srt=off --gb28181=off --cxx11=off --cxx14=off --sanitizer=off && make
|
||||
|
||||
FROM ossrs/srs:dev6-cache AS centos6-all
|
||||
COPY . /srs
|
||||
RUN cd /srs/trunk && ./configure --srt=on --gb28181=on --h265=on --cxx11=off --cxx14=off --sanitizer=off && make
|
||||
|
||||
########################################################
|
||||
FROM ossrs/srs:ubuntu16-cache AS ubuntu16-baseline
|
||||
COPY . /srs
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue