Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
ZLMediaKit
概览
Overview
Details
Activity
Cycle Analytics
版本库
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
问题
0
Issues
0
列表
Board
标记
里程碑
合并请求
0
Merge Requests
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
Snippets
成员
Collapse sidebar
Close sidebar
活动
图像
聊天
创建新问题
作业
提交
Issue Boards
Open sidebar
张翔宇
ZLMediaKit
Commits
8e3cbd11
Commit
8e3cbd11
authored
Apr 06, 2020
by
Gemfield
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Dockerfile to 20.04 version
parent
4d743606
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
31 行增加
和
28 行删除
+31
-28
README.md
+3
-4
build_docker_images.sh
+5
-2
docker/ubuntu16.04/Dockerfile.devel
+4
-3
docker/ubuntu16.04/Dockerfile.runtime
+7
-7
docker/ubuntu18.04/Dockerfile.devel
+5
-5
docker/ubuntu18.04/Dockerfile.runtime
+7
-7
没有找到文件。
README.md
查看文件 @
8e3cbd11
...
@@ -140,12 +140,11 @@
...
@@ -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
.
```
```
## 使用方法
## 使用方法
...
...
build_docker_images.sh
查看文件 @
8e3cbd11
#!/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
.
docker/ubuntu16.04/Dockerfile.devel
查看文件 @
8e3cbd11
...
@@ -23,9 +23,10 @@ RUN apt-get update && \
...
@@ -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 && \
...
@@ -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
docker/ubuntu16.04/Dockerfile.runtime
查看文件 @
8e3cbd11
...
@@ -24,8 +24,8 @@ RUN apt-get update && \
...
@@ -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 && \
...
@@ -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,12 +51,13 @@ RUN apt-get update && \
...
@@ -51,12 +51,13 @@ 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/
COPY --from=build /opt/media/ZLMediaKit/release/linux/Release/MediaServer /opt/media/bin/MediaServer
COPY --from=build /opt/media/ZLMediaKit/release/linux/Release/MediaServer /opt/media/bin/MediaServer
ENV PATH /opt/media/bin:$PATH
ENV PATH /opt/media/bin:$PATH
CMD MediaServer
CMD MediaServer
\ No newline at end of file
docker/ubuntu18.04/Dockerfile.devel
查看文件 @
8e3cbd11
...
@@ -24,9 +24,10 @@ RUN apt-get update && \
...
@@ -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 && \
...
@@ -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
\ No newline at end of file
docker/ubuntu18.04/Dockerfile.runtime
查看文件 @
8e3cbd11
...
@@ -24,8 +24,8 @@ RUN apt-get update && \
...
@@ -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 && \
...
@@ -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,12 +51,13 @@ RUN apt-get update && \
...
@@ -51,12 +51,13 @@ 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/
COPY --from=build /opt/media/ZLMediaKit/release/linux/Release/MediaServer /opt/media/bin/MediaServer
COPY --from=build /opt/media/ZLMediaKit/release/linux/Release/MediaServer /opt/media/bin/MediaServer
ENV PATH /opt/media/bin:$PATH
ENV PATH /opt/media/bin:$PATH
CMD MediaServer
CMD MediaServer
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论