amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 11:17:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xiongziliang 2020-04-07 13:11:05 +08:00
commit 43579a5618
6 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -140,12 +140,11 @@
## Docker 镜像 ## Docker 镜像
你可以从Docker Hub下载已经编译好的镜像并启动它： 你可以从Docker Hub下载已经编译好的镜像并启动它：
```bash ```bash
docker run -id -p 1935:1935 -p 8080:80 gemfield/zlmediakit docker run -id -p 1935:1935 -p 8080:80 gemfield/zlmediakit:20.04-runtime-ubuntu18.04
``` ```
你要可以在Ubuntu 16.04下根据Dockerfile编译镜像： 你也可以根据Dockerfile编译镜像：
```bash ```bash
cd docker bash build_docker_images.sh
docker build -t zlmediakit .
``` ```
## 使用方法 ## 使用方法

7
build_docker_images.sh
View File

@ -1,3 +1,6 @@
#!/bin/bash #!/bin/bash
docker build -t gemfield/zlmediakit:20.01-runtime-ubuntu18.04 -f docker/ubuntu18.04/Dockerfile.runtime . set -e
#docker build -t gemfield/zlmediakit:20.01-devel-ubuntu18.04 -f docker/ubuntu18.04/Dockerfile.devel . docker build -t gemfield/zlmediakit:20.04-runtime-ubuntu18.04 -f docker/ubuntu18.04/Dockerfile.runtime .
docker build -t gemfield/zlmediakit:20.04-devel-ubuntu18.04 -f docker/ubuntu18.04/Dockerfile.devel .
docker build -t gemfield/zlmediakit:20.04-runtime-ubuntu16.04 -f docker/ubuntu16.04/Dockerfile.runtime .
docker build -t gemfield/zlmediakit:20.04-devel-ubuntu16.04 -f docker/ubuntu16.04/Dockerfile.devel .

7
docker/ubuntu16.04/Dockerfile.devel
View File

@ -23,9 +23,10 @@ RUN apt-get update && \
libmysqlclient-dev \ libmysqlclient-dev \
libx264-dev \ libx264-dev \
libfaac-dev \ libfaac-dev \
ffmpeg \
libmp4v2-dev && \ libmp4v2-dev && \
apt autoremove -y && \ apt-get autoremove -y && \
apt clean -y && \ apt-get clean -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN mkdir -p /opt/media RUN mkdir -p /opt/media
@ -37,7 +38,7 @@ RUN git clone --depth=1 https://github.com/xiongziliang/ZLMediaKit && \
WORKDIR /opt/media/ZLMediaKit/build WORKDIR /opt/media/ZLMediaKit/build
RUN cmake -DCMAKE_BUILD_TYPE=Release .. && \ RUN cmake -DCMAKE_BUILD_TYPE=Release .. && \
make -j4 make
ENV PATH /opt/media/ZLMediaKit/release/linux/Release/:$PATH ENV PATH /opt/media/ZLMediaKit/release/linux/Release/:$PATH
CMD MediaServer CMD MediaServer

11
docker/ubuntu16.04/Dockerfile.runtime
View File

@ -24,8 +24,8 @@ RUN apt-get update && \
libx264-dev \ libx264-dev \
libfaac-dev \ libfaac-dev \
libmp4v2-dev && \ libmp4v2-dev && \
apt autoremove -y && \ apt-get autoremove -y && \
apt clean -y && \ apt-get clean -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN mkdir -p /opt/media RUN mkdir -p /opt/media
@ -37,7 +37,7 @@ RUN git clone --depth=1 https://github.com/xiongziliang/ZLMediaKit && \
WORKDIR /opt/media/ZLMediaKit/build WORKDIR /opt/media/ZLMediaKit/build
RUN cmake -DCMAKE_BUILD_TYPE=Release .. && \ RUN cmake -DCMAKE_BUILD_TYPE=Release .. && \
make -j4 make
FROM ubuntu:16.04 FROM ubuntu:16.04
LABEL maintainer "Gemfield <gemfield@civilnet.cn>" LABEL maintainer "Gemfield <gemfield@civilnet.cn>"
@ -51,9 +51,10 @@ RUN apt-get update && \
libssl-dev \ libssl-dev \
libx264-dev \ libx264-dev \
libfaac-dev \ libfaac-dev \
ffmpeg \
libmp4v2-dev && \ libmp4v2-dev && \
apt autoremove -y && \ apt-get autoremove -y && \
apt clean -y && \ apt-get clean -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
WORKDIR /opt/media/bin/ WORKDIR /opt/media/bin/

7
docker/ubuntu18.04/Dockerfile.devel
View File

@ -24,9 +24,10 @@ RUN apt-get update && \
libmysqlclient-dev \ libmysqlclient-dev \
libx264-dev \ libx264-dev \
libfaac-dev \ libfaac-dev \
ffmpeg \
libmp4v2-dev && \ libmp4v2-dev && \
apt autoremove -y && \ apt-get autoremove -y && \
apt clean -y && \ apt-get clean -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN mkdir -p /opt/media RUN mkdir -p /opt/media
@ -38,7 +39,7 @@ RUN git clone --depth=1 https://github.com/xiongziliang/ZLMediaKit && \
WORKDIR /opt/media/ZLMediaKit/build WORKDIR /opt/media/ZLMediaKit/build
RUN cmake -DCMAKE_BUILD_TYPE=Release .. && \ RUN cmake -DCMAKE_BUILD_TYPE=Release .. && \
make -j4 make
ENV PATH /opt/media/ZLMediaKit/release/linux/Release:$PATH ENV PATH /opt/media/ZLMediaKit/release/linux/Release:$PATH
CMD MediaServer CMD MediaServer

11
docker/ubuntu18.04/Dockerfile.runtime
View File

@ -24,8 +24,8 @@ RUN apt-get update && \
libx264-dev \ libx264-dev \
libfaac-dev \ libfaac-dev \
libmp4v2-dev && \ libmp4v2-dev && \
apt autoremove -y && \ apt-get autoremove -y && \
apt clean -y && \ apt-get clean -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN mkdir -p /opt/media RUN mkdir -p /opt/media
@ -37,7 +37,7 @@ RUN git clone --depth=1 https://github.com/xiongziliang/ZLMediaKit && \
WORKDIR /opt/media/ZLMediaKit/build WORKDIR /opt/media/ZLMediaKit/build
RUN cmake -DCMAKE_BUILD_TYPE=Release .. && \ RUN cmake -DCMAKE_BUILD_TYPE=Release .. && \
make -j4 make
FROM ubuntu:18.04 FROM ubuntu:18.04
LABEL maintainer "Gemfield <gemfield@civilnet.cn>" LABEL maintainer "Gemfield <gemfield@civilnet.cn>"
@ -51,9 +51,10 @@ RUN apt-get update && \
libssl-dev \ libssl-dev \
libx264-dev \ libx264-dev \
libfaac-dev \ libfaac-dev \
ffmpeg \
libmp4v2-dev && \ libmp4v2-dev && \
apt autoremove -y && \ apt-get autoremove -y && \
apt clean -y && \ apt-get clean -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
WORKDIR /opt/media/bin/ WORKDIR /opt/media/bin/