From 2fbb40135cba5265f0667fe48ab32e2cd63e4c0d Mon Sep 17 00:00:00 2001 From: monktan Date: Tue, 4 Jan 2022 21:13:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9docker=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E4=B8=BA=E5=9B=BD=E5=86=85=E6=BA=90=EF=BC=8C=E5=8A=A0=E5=BF=AB?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=9E=84=E5=BB=BA=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_docker_images.sh | 2 +- dockerfile | 8 ++++++-- sources.list | 11 +++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 sources.list diff --git a/build_docker_images.sh b/build_docker_images.sh index 95dde88a..bfbf1768 100644 --- a/build_docker_images.sh +++ b/build_docker_images.sh @@ -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" diff --git a/dockerfile b/dockerfile index dacc0da0..0b3e1f0e 100644 --- a/dockerfile +++ b/dockerfile @@ -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 \ diff --git a/sources.list b/sources.list new file mode 100644 index 00000000..5613ea80 --- /dev/null +++ b/sources.list @@ -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