diff --git a/.dockerignore b/.dockerignore index 7e47567..22c3151 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,4 @@ ** !dist/ !.docker/ +!.tags diff --git a/Dockerfile-stable b/Dockerfile-stable index c8d0d72..a846ec3 100644 --- a/Dockerfile-stable +++ b/Dockerfile-stable @@ -1,4 +1,4 @@ -FROM alpine:3.13 +FROM alpine:latest ENV REPOSITORY https://github.com/SoftEtherVPN/SoftEtherVPN.git diff --git a/pipe/tasks.go b/pipe/tasks.go index a78b49d..65428b1 100644 --- a/pipe/tasks.go +++ b/pipe/tasks.go @@ -341,15 +341,18 @@ func CreateBridgeDevice(tl *TaskList[Pipe]) *Task[Pipe] { "addif", t.Pipe.LinuxBridge.BridgeInterface, t.Pipe.SoftEther.TapInterface, + t.Pipe.LinuxBridge.UpstreamInterface, ). SetLogLevel(LOG_LEVEL_DEBUG, LOG_LEVEL_DEFAULT, LOG_LEVEL_DEBUG). AddSelfToTheTask() t.CreateCommand( - "brctl", - "addif", + "ip", + "link", + "set", + "dev", t.Pipe.LinuxBridge.BridgeInterface, - t.Pipe.LinuxBridge.UpstreamInterface, + "up", ). SetLogLevel(LOG_LEVEL_DEBUG, LOG_LEVEL_DEFAULT, LOG_LEVEL_DEBUG). AddSelfToTheTask()