Merge remote-tracking branch 'origin/master'

build_docker_images.sh

@@ -53,7 +53,7 @@ case $type in
 	'build')
 	'build')
 	rm -rf ./build/CMakeCache.txt
 	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')
 	'push')
 		echo "push to dst registry"
 		echo "push to dst registry"

dockerfile

@@ -10,7 +10,9 @@ EXPOSE 10000/udp
 EXPOSE 10000/tcp
 EXPOSE 10000/tcp
 EXPOSE 8000/udp
 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" \
          DEBIAN_FRONTEND="noninteractive" \
          apt-get install -y --no-install-recommends \
          apt-get install -y --no-install-recommends \
          build-essential \
          build-essential \
@@ -48,7 +50,9 @@ RUN cmake -DCMAKE_BUILD_TYPE=${MODEL} -DENABLE_WEBRTC=true -DENABLE_TESTS=false
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 ARG MODEL
 ARG MODEL
 
 
-RUN apt-get update && apt-get dist-upgrade && \
+ADD sources.list /etc/apt/sources.list
+
+RUN apt-get update && \
          DEBIAN_FRONTEND="noninteractive" \
          DEBIAN_FRONTEND="noninteractive" \
          apt-get install -y --no-install-recommends \
          apt-get install -y --no-install-recommends \
          vim \
          vim \

sources.list

+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