mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-10-31 00:37:39 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
328dc77a78
@ -53,7 +53,7 @@ case $type in
|
||||
'build')
|
||||
rm -rf ./build/CMakeCache.txt
|
||||
# 以腾讯云账号为例
|
||||
docker build --build-arg MODEL=$model -t ccr.ccs.tencentyun.com/$namespace/$packagename:$model.$version .
|
||||
docker build --network=host --build-arg MODEL=$model -t ccr.ccs.tencentyun.com/$namespace/$packagename:$model.$version .
|
||||
;;
|
||||
'push')
|
||||
echo "push to dst registry"
|
||||
|
@ -10,7 +10,9 @@ EXPOSE 10000/udp
|
||||
EXPOSE 10000/tcp
|
||||
EXPOSE 8000/udp
|
||||
|
||||
RUN apt-get update && apt-get dist-upgrade && \
|
||||
ADD sources.list /etc/apt/sources.list
|
||||
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND="noninteractive" \
|
||||
apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
@ -48,7 +50,9 @@ RUN cmake -DCMAKE_BUILD_TYPE=${MODEL} -DENABLE_WEBRTC=true -DENABLE_TESTS=false
|
||||
FROM ubuntu:18.04
|
||||
ARG MODEL
|
||||
|
||||
RUN apt-get update && apt-get dist-upgrade && \
|
||||
ADD sources.list /etc/apt/sources.list
|
||||
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND="noninteractive" \
|
||||
apt-get install -y --no-install-recommends \
|
||||
vim \
|
||||
|
11
sources.list
Normal file
11
sources.list
Normal file
@ -0,0 +1,11 @@
|
||||
deb http://mirrors.cloud.tencent.com/ubuntu/ bionic main restricted universe multiverse
|
||||
# deb-src http://mirrors.cloud.tencent.com/ubuntu/ bionic main restricted universe multiverse
|
||||
deb http://mirrors.cloud.tencent.com/ubuntu/ bionic-updates main restricted universe multiverse
|
||||
# deb-src http://mirrors.cloud.tencent.com/ubuntu/ bionic-updates main restricted universe multiverse
|
||||
deb http://mirrors.cloud.tencent.com/ubuntu/ bionic-backports main restricted universe multiverse
|
||||
# deb-src http://mirrors.cloud.tencent.com/ubuntu/ bionic-backports main restricted universe multiverse
|
||||
deb http://mirrors.cloud.tencent.com/ubuntu/ bionic-security main restricted universe multiverse
|
||||
# deb-src http://mirrors.cloud.tencent.com/ubuntu/ bionic-security main restricted universe multiverse
|
||||
|
||||
# deb http://mirrors.cloud.tencent.com/ubuntu/ bionic-proposed main restricted universe multiverse
|
||||
# deb-src http://mirrors.cloud.tencent.com/ubuntu/ bionic-proposed main restricted universe multiverse
|
Loading…
Reference in New Issue
Block a user