From 3b4371b0f1c012be6b0eda82c5e72f3a1b600d92 Mon Sep 17 00:00:00 2001 From: zhangwenyu Date: Thu, 25 Jan 2024 11:11:46 +0800 Subject: [PATCH] =?UTF-8?q?fix=20nginx=E4=B8=8D=E5=90=AF=E5=8A=A8=E4=BB=A5?= =?UTF-8?q?=E5=8F=8Aarm=E6=9E=B6=E6=9E=84=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ build/Dockerfile | 2 +- build/start.sh | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index eaeaf91..91e95b6 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,9 @@ ## 打包 ```sh +npm install -g pnpm +pnpm i +pnpm build docker build -f ./build/Dockerfile -t clash-and-dashboard:latest . ``` diff --git a/build/Dockerfile b/build/Dockerfile index 6bc42ee..6a4987f 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM dreamacro/clash:v1.16.0 +FROM --platform=$TARGETPLATFORM dreamacro/clash:v1.16.0 EXPOSE 8080 diff --git a/build/start.sh b/build/start.sh index 73cc143..7a8fe82 100644 --- a/build/start.sh +++ b/build/start.sh @@ -1,2 +1,4 @@ -nginx -/clash \ No newline at end of file +#!/bin/sh +sleep 5s +/usr/sbin/nginx +/clash