From c77a765ae9b2423a8a0afc2ef774d4c9ed4a3af3 Mon Sep 17 00:00:00 2001 From: bjdgyc Date: Mon, 2 Aug 2021 13:25:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- build.sh | 1 + web/src/pages/group/List.vue | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 69f543b..7282630 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ COPY --from=builder_node /web/ui /anylink/server/ui #TODO 本地打包时使用镜像 #RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories -RUN apk add --no-cache git gcc +RUN apk add --no-cache git gcc musl-dev RUN cd /anylink/server;go build -o anylink -ldflags "-X main.CommitId=$(git rev-parse HEAD)" \ && /anylink/server/anylink tool -v diff --git a/build.sh b/build.sh index 27b757e..2699d84 100644 --- a/build.sh +++ b/build.sh @@ -39,6 +39,7 @@ mkdir $deploy cp -r server/anylink $deploy cp -r server/bridge-init.sh $deploy +cp -r server/conf $deploy cp -r systemd $deploy diff --git a/web/src/pages/group/List.vue b/web/src/pages/group/List.vue index a765ff0..2f8eb96 100644 --- a/web/src/pages/group/List.vue +++ b/web/src/pages/group/List.vue @@ -166,7 +166,7 @@ - + @@ -455,4 +455,4 @@ export default { .el-select { width: 80px; } - + Date: Mon, 2 Aug 2021 14:15:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/pages/group/List.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/pages/group/List.vue b/web/src/pages/group/List.vue index 2f8eb96..c8d065c 100644 --- a/web/src/pages/group/List.vue +++ b/web/src/pages/group/List.vue @@ -455,4 +455,4 @@ export default { .el-select { width: 80px; } -