Merge pull request #890 from Tencent/bugfix/update-server-dockerfile

🐛 修复Dockerfile配置
Tencent · Aug 10, 2023 · eb0613a · eb0613a
2 parents fea00d8 + 403c653
commit eb0613a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 30 deletions.
diff --git a/server/projects/analysis/Dockerfile b/server/projects/analysis/Dockerfile
@@ -1,10 +1,5 @@
 FROM python:3.7-slim-bullseye
 
-# RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye main non-free contrib' > /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye-updates main non-free contrib' >> /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian-security bullseye-security main non-free contrib' >> /etc/apt/sources.list
-
 ARG EXTRA_TOOLS="gnupg curl wget jq net-tools procps default-libmysqlclient-dev locales inotify-tools gcc telnet iputils-ping vim openssh-client"
 
 RUN set -ex && cd / \
@@ -25,6 +20,5 @@ WORKDIR /var/www/django/codedog
 COPY . .
 
 RUN mkdir -p log/ && \
-    mkdir ~/.pip/ && echo "[global]\nindex-url = https://mirrors.cloud.tencent.com/pypi/simple" >> ~/.pip/pip.conf && \
     pip install -U setuptools pip && \
     pip install -r requirements.txt
diff --git a/server/projects/file/Dockerfile b/server/projects/file/Dockerfile
@@ -1,10 +1,5 @@
 FROM python:3.7-slim-bullseye
 
-# RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye main non-free contrib' > /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye-updates main non-free contrib' >> /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian-security bullseye-security main non-free contrib' >> /etc/apt/sources.list
-
 ARG EXTRA_TOOLS="gnupg curl wget jq net-tools procps default-libmysqlclient-dev locales inotify-tools gcc telnet iputils-ping vim openssh-client"
 
 RUN set -ex && cd / \
@@ -25,6 +20,5 @@ WORKDIR /var/www/django/codedog
 COPY . .
 
 RUN mkdir -p log/ && \
-    mkdir ~/.pip/ && echo "[global]\nindex-url = https://mirrors.cloud.tencent.com/pypi/simple" >> ~/.pip/pip.conf && \
     pip install -U setuptools pip && \
     pip install -r requirements.txt
diff --git a/server/projects/login/Dockerfile b/server/projects/login/Dockerfile
@@ -1,10 +1,5 @@
 FROM python:3.7-slim-bullseye
 
-# RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye main non-free contrib' > /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye-updates main non-free contrib' >> /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian-security bullseye-security main non-free contrib' >> /etc/apt/sources.list
-
 ARG EXTRA_TOOLS="gnupg curl wget jq net-tools procps default-libmysqlclient-dev locales inotify-tools gcc telnet iputils-ping vim openssh-client"
 
 RUN set -ex && cd / \
@@ -25,6 +20,5 @@ WORKDIR /var/www/django/codedog
 COPY . .
 
 RUN mkdir -p log/ && \
-    mkdir ~/.pip/ && echo "[global]\nindex-url = https://mirrors.cloud.tencent.com/pypi/simple" >> ~/.pip/pip.conf && \
     pip install -U setuptools pip && \
     pip install -r requirements.txt
diff --git a/server/projects/main/Dockerfile b/server/projects/main/Dockerfile
@@ -1,10 +1,5 @@
 FROM python:3.7-slim-bullseye
 
-# RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye main non-free contrib' > /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye-updates main non-free contrib' >> /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian-security bullseye-security main non-free contrib' >> /etc/apt/sources.list
-
 ARG EXTRA_TOOLS="gnupg curl wget jq net-tools procps default-libmysqlclient-dev locales inotify-tools gcc telnet iputils-ping vim openssh-client"
 
 RUN set -ex && cd / \
@@ -25,6 +20,5 @@ WORKDIR /var/www/django/codedog
 COPY . .
 
 RUN mkdir -p log/ && \
-    mkdir ~/.pip/ && echo "[global]\nindex-url = https://mirrors.cloud.tencent.com/pypi/simple" >> ~/.pip/pip.conf && \
     pip install -U setuptools pip && \
     pip install -r requirements.txt
diff --git a/server/projects/scmproxy/Dockerfile b/server/projects/scmproxy/Dockerfile
@@ -1,10 +1,5 @@
 FROM python:3.7-slim-bullseye
 
-# RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye main non-free contrib' > /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian/ bullseye-updates main non-free contrib' >> /etc/apt/sources.list && \
-#     echo 'deb http://mirrors.tencent.com/debian-security bullseye-security main non-free contrib' >> /etc/apt/sources.list
-
 ARG EXTRA_TOOLS="gnupg curl wget jq net-tools procps default-libmysqlclient-dev locales inotify-tools gcc git subversion telnet iputils-ping vim openssh-client"
 
 RUN set -ex && cd / \
@@ -25,6 +20,5 @@ WORKDIR /var/www/django/codedog
 COPY . .
 
 RUN mkdir -p log/ && \
-    mkdir ~/.pip/ && echo "[global]\nindex-url = https://mirrors.cloud.tencent.com/pypi/simple" >> ~/.pip/pip.conf && \
     pip install -U setuptools pip && \
     pip install -r requirements.txt