From debe95791ef16fa6c57fe98d393b915d1dbff00e Mon Sep 17 00:00:00 2001 From: isummer Date: Wed, 12 Oct 2022 17:32:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=B9=E5=99=A8=E9=83=A8?= =?UTF-8?q?=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fir_ser/Dockerfile | 4 ++-- fir_ser/Dockerfile.cli | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/fir_ser/Dockerfile b/fir_ser/Dockerfile index 7c1b6f6..44244d3 100644 --- a/fir_ser/Dockerfile +++ b/fir_ser/Dockerfile @@ -1,7 +1,6 @@ FROM python:3.9.14-slim # Fixes some weird terminal issues such as broken clear / CTRL+L -ARG PIP_MIRROR=https://mirrors.163.com/pypi/simple RUN sed -i 's/deb.debian.org/mirrors.163.com/g' /etc/apt/sources.list \ && sed -i 's/security.debian.org/mirrors.163.com/g' /etc/apt/sources.list \ @@ -17,10 +16,11 @@ ADD zsign-1.1.2.tar.gz /opt/ RUN cd /opt/zsign-1.1.2/ && g++ *.cpp common/*.cpp -lcrypto -O3 -std=c++11 -o zsign && cp zsign /usr/bin/ && rm -rf /opt/zsign-1.1.2/ # install pip COPY requirements.txt /opt/requirements.txt -RUN cd /opt/ && pip install -U setuptools pip -i ${PIP_MIRROR} --ignore-installed && pip install --no-cache-dir -r requirements.txt -i ${PIP_MIRROR} && pip install --no-cache-dir uwsgi -i ${PIP_MIRROR} +RUN cd /opt/ && pip install -U setuptools pip --ignore-installed && pip install --no-cache-dir -r requirements.txt && pip install --no-cache-dir uwsgi WORKDIR /data/fir_ser/ +COPY entrypoint.sh entrypoint.sh RUN addgroup --system --gid 101 nginx \ && adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx diff --git a/fir_ser/Dockerfile.cli b/fir_ser/Dockerfile.cli index 98cd2a9..2fada16 100644 --- a/fir_ser/Dockerfile.cli +++ b/fir_ser/Dockerfile.cli @@ -1,10 +1,7 @@ FROM python:3.9.14-slim -ARG PIP_MIRROR=https://mirrors.aliyun.com/pypi/simple - -RUN pip install --upgrade pip --no-cache-dir -i ${PIP_MIRROR} && \ - pip install setuptools-rust oss2 requests-toolbelt androguard requests --no-cache-dir -i ${PIP_MIRROR} && \ - rm -rf ~/.cache/* +RUN pip install --upgrade pip --no-cache-dir && \ + pip install setuptools-rust oss2 requests-toolbelt androguard requests --no-cache-dir WORKDIR /opt/