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 @@ <el-form-item label="带宽限制" prop="bandwidth"> <el-input v-model.number="ruleForm.bandwidth"> - <template slot="append">BYTE</template> + <template slot="append">BYTE/S</template> </el-input> </el-form-item> <el-form-item label="本地网络" prop="allow_lan"> @@ -455,4 +455,4 @@ export default { .el-select { width: 80px; } -</style> +</style \ No newline at end of file