From f6fd01d1e541a5ac2a60870e8722bff6d23f5716 Mon Sep 17 00:00:00 2001
From: bjdgyc <bjdgyc@163.com>
Date: Mon, 5 Jul 2021 13:26:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E5=88=B0=20conf=20?=
=?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/base/app_ver.go | 2 +-
server/base/config.go | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/base/app_ver.go b/server/base/app_ver.go
index a1dfc2e..3ff779f 100644
--- a/server/base/app_ver.go
+++ b/server/base/app_ver.go
@@ -3,5 +3,5 @@ package base
const (
APP_NAME = "AnyLink"
// 修复严重bug
- APP_VER = "0.4.1"
+ APP_VER = "0.4.2"
)
diff --git a/server/base/config.go b/server/base/config.go
index 810f7a5..d887f15 100644
--- a/server/base/config.go
+++ b/server/base/config.go
@@ -23,10 +23,10 @@ var configs = []config{
{Typ: cfgStr, Name: "server_dtls_addr", Usage: "DTLS监听地址", ValStr: ":4433"},
{Typ: cfgStr, Name: "admin_addr", Usage: "后台服务监听地址", ValStr: ":8800"},
{Typ: cfgBool, Name: "proxy_protocol", Usage: "TCP代理协议", ValBool: false},
- {Typ: cfgStr, Name: "db_file", Usage: "数据库地址", ValStr: "./data.db"},
- {Typ: cfgStr, Name: "cert_file", Usage: "证书文件", ValStr: "./vpn_cert.pem"},
- {Typ: cfgStr, Name: "cert_key", Usage: "证书密钥", ValStr: "./vpn_cert.key"},
- {Typ: cfgStr, Name: "files_path", Usage: "外部下载文件路径", ValStr: "./files"},
+ {Typ: cfgStr, Name: "db_file", Usage: "数据库地址", ValStr: "./conf/data.db"},
+ {Typ: cfgStr, Name: "cert_file", Usage: "证书文件", ValStr: "./conf/vpn_cert.pem"},
+ {Typ: cfgStr, Name: "cert_key", Usage: "证书密钥", ValStr: "./conf/vpn_cert.key"},
+ {Typ: cfgStr, Name: "files_path", Usage: "外部下载文件路径", ValStr: "./conf/files"},
{Typ: cfgStr, Name: "log_path", Usage: "日志文件路径,默认标准输出", ValStr: ""},
{Typ: cfgStr, Name: "log_level", Usage: "日志等级 debug、info、warn、error", ValStr: "info"},
{Typ: cfgBool, Name: "pprof", Usage: "开启pprof", ValBool: false},
From 66ef6399563b6856e6b2b4a7fd89d45c393d2cb0 Mon Sep 17 00:00:00 2001
From: bjdgyc <bjdgyc@163.com>
Date: Mon, 5 Jul 2021 13:35:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E5=88=B0=20conf=20?=
=?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Dockerfile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index bab8015..2ebaf26 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN npx browserslist@latest --update-db \
&& ls /web/ui
# server
-FROM golang:alpine as builder_golang
+FROM golang:1.16-alpine as builder_golang
#TODO 本地打包时使用镜像
#ENV GOPROXY=https://goproxy.io
ENV GOOS=linux
@@ -29,12 +29,13 @@ LABEL maintainer="github.com/bjdgyc"
ENV IPV4_CIDR="192.168.10.0/24"
WORKDIR /app
-COPY --from=builder_node /web/ui /app/ui
COPY --from=builder_golang /anylink/server/anylink /app/
-COPY ./server/conf /app/conf
-COPY ./server/files /app/files
COPY docker_entrypoint.sh /app/
+COPY ./server/conf /app/conf
+COPY ./server/files /app/conf/files
+
+
#TODO 本地打包时使用镜像
#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
RUN apk add --no-cache bash iptables \