From ef3c4908597ae43c953cfb739bf7ec24ec3c8e5e Mon Sep 17 00:00:00 2001 From: lz-wang Date: Tue, 6 Sep 2022 22:39:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Dockerfile=E7=94=B1=E4=BA=8E?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E4=B8=8B=E8=BD=BD=E6=85=A2=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-center/Dockerfile | 22 +++++++++++----------- python3.10/Dockerfile | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cloud-center/Dockerfile b/cloud-center/Dockerfile index 3869cd2..4e2751b 100644 --- a/cloud-center/Dockerfile +++ b/cloud-center/Dockerfile @@ -12,13 +12,6 @@ VOLUME /project # setup workdir WORKDIR /project -# setup mirrors of apt -# https://mirrors.tuna.tsinghua.edu.cn/help/debian/ -RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye main contrib non-free" > /etc/apt/sources.list \ - && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-updates main contrib non-free" >> /etc/apt/sources.list \ - && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-backports main contrib non-free" >> /etc/apt/sources.list \ - && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bullseye-security main contrib non-free" >> /etc/apt/sources.list - # update apt packages RUN apt-get update -y && apt-get upgrade -y \ && apt-get install apt-utils -y \ @@ -40,10 +33,6 @@ RUN npm install -g cnpm --registry=https://registry.npm.taobao.org \ COPY ./cloud-center/gitsh /project/tools/gitsh RUN chmod +x /project/tools/gitsh -# setup mirrors of pip -# https://mirrors.tuna.tsinghua.edu.cn/help/pypi/ -RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple - # python pip install dependencies COPY ./cloud-center/requirements.txt /project/requirements.txt @@ -66,5 +55,16 @@ RUN echo "alias ll='ls -la'" >> /root/.bashrc RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && date +# setup mirrors of apt +# https://mirrors.tuna.tsinghua.edu.cn/help/debian/ +RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye main contrib non-free" > /etc/apt/sources.list \ + && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-updates main contrib non-free" >> /etc/apt/sources.list \ + && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-backports main contrib non-free" >> /etc/apt/sources.list \ + && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bullseye-security main contrib non-free" >> /etc/apt/sources.list + +# setup mirrors of pip +# https://mirrors.tuna.tsinghua.edu.cn/help/pypi/ +RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple + # on start up CMD ["python3"] diff --git a/python3.10/Dockerfile b/python3.10/Dockerfile index 1827802..0ff5d92 100644 --- a/python3.10/Dockerfile +++ b/python3.10/Dockerfile @@ -12,10 +12,6 @@ VOLUME /project # setup workdir WORKDIR /project -# setup mirrors of pip -# https://mirrors.tuna.tsinghua.edu.cn/help/pypi/ -RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple - # upgrade pip RUN pip install --no-cache-dir --upgrade pip \ && rm -rf /root/.cache \ @@ -25,13 +21,6 @@ RUN pip install --no-cache-dir --upgrade pip \ RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && date -# setup mirrors of apt -# https://mirrors.tuna.tsinghua.edu.cn/help/debian/ -RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye main contrib non-free" > /etc/apt/sources.list \ - && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-updates main contrib non-free" >> /etc/apt/sources.list \ - && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-backports main contrib non-free" >> /etc/apt/sources.list \ - && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bullseye-security main contrib non-free" >> /etc/apt/sources.list - # update apt packages RUN apt-get update -y && apt-get upgrade -y \ && apt-get install apt-utils -y \ @@ -40,4 +29,15 @@ RUN apt-get update -y && apt-get upgrade -y \ # setup alias RUN echo "alias ll='ls -la'" >> /root/.bashrc +# setup mirrors of apt +# https://mirrors.tuna.tsinghua.edu.cn/help/debian/ +RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye main contrib non-free" > /etc/apt/sources.list \ + && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-updates main contrib non-free" >> /etc/apt/sources.list \ + && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ bullseye-backports main contrib non-free" >> /etc/apt/sources.list \ + && echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian-security bullseye-security main contrib non-free" >> /etc/apt/sources.list + +# setup mirrors of pip +# https://mirrors.tuna.tsinghua.edu.cn/help/pypi/ +RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple + CMD ["python3"]