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: Remove CentOS 6 support. (#3287)

Browse source 
1. Remove CentOS 6 for test and utest.
2. Statically build FFmpeg, no so depends.
This commit is contained in:
Winlin 2022-12-01 21:32:08 +08:00 • committed by GitHub
parent aa5496aa69
commit e83fc2388b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
.github/workflows/test.yml vendored
View file

@ -82,22 +82,6 @@ jobs:
outputs: outputs:
SRS_BUILD_CENTOS7_DONE: ok SRS_BUILD_CENTOS7_DONE: ok
build-centos6:
name: build-centos6
runs-on: ubuntu-20.04
needs:
- utest
steps:
- name: Checkout repository
uses: actions/checkout@v2
# Build for CentOS 6
- name: Build on CentOS6, baseline
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos6-baseline .
- name: Build on CentOS6, with all features
run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos6-all .
outputs:
SRS_BUILD_CENTOS6_DONE: ok
build-ubuntu16: build-ubuntu16:
name: build-ubuntu16 name: build-ubuntu16
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
@ -176,7 +160,6 @@ jobs:
name: build name: build
needs: needs:
- build-centos7 - build-centos7
- build-centos6
- build-ubuntu16 - build-ubuntu16
- build-ubuntu18 - build-ubuntu18
- build-ubuntu20 - build-ubuntu20

7
trunk/Dockerfile
View file

@ -34,12 +34,6 @@ RUN cp -R conf /usr/local/srs/conf && \
cp -R research/players /usr/local/srs/objs/nginx/html/ && \ cp -R research/players /usr/local/srs/objs/nginx/html/ && \
cp -R 3rdparty/signaling/www/demos /usr/local/srs/objs/nginx/html/ cp -R 3rdparty/signaling/www/demos /usr/local/srs/objs/nginx/html/
# Copy the shared libraries for FFmpeg.
RUN mkdir -p /usr/local/shared && \
cp $(ldd /usr/local/bin/ffmpeg |grep libxml2 |awk '{print $3}') /usr/local/shared/ && \
cp $(ldd /usr/local/bin/ffmpeg |grep libicuuc |awk '{print $3}') /usr/local/shared/ && \
cp $(ldd /usr/local/bin/ffmpeg |grep libicudata |awk '{print $3}') /usr/local/shared/
############################################################ ############################################################
# dist # dist
############################################################ ############################################################
@ -53,7 +47,6 @@ RUN echo "BUILDPLATFORM: $BUILDPLATFORM, TARGETPLATFORM: $TARGETPLATFORM"
EXPOSE 1935 1985 8080 8000/udp 10080/udp EXPOSE 1935 1985 8080 8000/udp 10080/udp
# FFMPEG 4.1 # FFMPEG 4.1
COPY --from=build /usr/local/shared/* /lib/
COPY --from=build /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg COPY --from=build /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg
# SRS binary, config files and srs-console. # SRS binary, config files and srs-console.
COPY --from=build /usr/local/srs /usr/local/srs COPY --from=build /usr/local/srs /usr/local/srs

9
trunk/Dockerfile.builds
View file

@ -19,15 +19,6 @@ FROM ossrs/srs:dev-cache AS centos7-ansi-no-ffmpeg
COPY . /srs COPY . /srs
RUN cd /srs/trunk && ./configure --srt=off --gb28181=off --cxx11=off --cxx14=off --ffmpeg-fit=off && make 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 --cxx11=off --cxx14=off --sanitizer=off && make
######################################################## ########################################################
FROM ossrs/srs:ubuntu16-cache AS ubuntu16-baseline FROM ossrs/srs:ubuntu16-cache AS ubuntu16-baseline
COPY . /srs COPY . /srs