From ce385d9608c895435e51d170f27f7711be1cb214 Mon Sep 17 00:00:00 2001 From: imgyh <1974355683@qq.com> Date: Sun, 21 May 2023 16:44:38 +0800 Subject: [PATCH] =?UTF-8?q?ci(docker):=20=E6=9B=B4=E6=96=B0=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E9=83=A8=E7=BD=B2=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker.yml | 1 + Dockerfile | 2 +- requirements.txt | 2 -- requirements_docker.txt | 4 ++++ 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 requirements_docker.txt diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 308e451..8696eab 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -50,6 +50,7 @@ jobs: # 生成多平台镜像, 看 基础镜像 有哪些平台的镜像,下面就写哪些。 platforms: | linux/amd64 + linux/386 linux/arm/v7 linux/arm64/v8 # docker build arg, 注入 APP_NAME/APP_VERSION diff --git a/Dockerfile b/Dockerfile index 18dc486..6ff08b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ADD . $WORKDIR RUN sed -i s/deb.debian.org/mirrors.aliyun.com/g /etc/apt/sources.list -RUN pip3 install -r requirements.txt +RUN pip3 install -r requirements_docker.txt ENV TZ=Asia/Shanghai diff --git a/requirements.txt b/requirements.txt index 0747e55..d5d877b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,5 @@ requests==2.28.2 flask==2.2.2 pyinstaller==5.7.0 -PyExecJS==1.5.1 -rich==13.3.2 tqdm==4.65.0 PyYAML==6.0 \ No newline at end of file diff --git a/requirements_docker.txt b/requirements_docker.txt new file mode 100644 index 0000000..325d588 --- /dev/null +++ b/requirements_docker.txt @@ -0,0 +1,4 @@ +requests==2.28.2 +flask==2.2.2 +tqdm==4.65.0 +PyYAML==6.0 \ No newline at end of file