sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-16 07:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[client] Simplify entrypoint by running netbird up unconditionally (#5652)

Browse Source
This commit is contained in:
Viktor Liu
2026-03-23 16:39:32 +08:00
committed by GitHub
parent 91f0d5cefd
commit fd9d430334
4 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/Dockerfile
View File

@@ -17,8 +17,7 @@ ENV \
NETBIRD_BIN="/usr/local/bin/netbird" \ NETBIRD_BIN="/usr/local/bin/netbird" \
NB_LOG_FILE="console,/var/log/netbird/client.log" \ NB_LOG_FILE="console,/var/log/netbird/client.log" \
NB_DAEMON_ADDR="unix:///var/run/netbird.sock" \ NB_DAEMON_ADDR="unix:///var/run/netbird.sock" \
NB_ENTRYPOINT_SERVICE_TIMEOUT="30" \ NB_ENTRYPOINT_SERVICE_TIMEOUT="30"
NB_ENTRYPOINT_LOGIN_TIMEOUT="30"
ENTRYPOINT [ "/usr/local/bin/netbird-entrypoint.sh" ] ENTRYPOINT [ "/usr/local/bin/netbird-entrypoint.sh" ]

3
client/Dockerfile-rootless
View File

@@ -23,8 +23,7 @@ ENV \
NB_DAEMON_ADDR="unix:///var/lib/netbird/netbird.sock" \ NB_DAEMON_ADDR="unix:///var/lib/netbird/netbird.sock" \
NB_LOG_FILE="console,/var/lib/netbird/client.log" \ NB_LOG_FILE="console,/var/lib/netbird/client.log" \
NB_DISABLE_DNS="true" \ NB_DISABLE_DNS="true" \
NB_ENTRYPOINT_SERVICE_TIMEOUT="30" \ NB_ENTRYPOINT_SERVICE_TIMEOUT="30"
NB_ENTRYPOINT_LOGIN_TIMEOUT="30"
ENTRYPOINT [ "/usr/local/bin/netbird-entrypoint.sh" ] ENTRYPOINT [ "/usr/local/bin/netbird-entrypoint.sh" ]

2
client/cmd/status.go
View File

@@ -218,7 +218,7 @@ func runHealthCheck(cmd *cobra.Command) error {
ctx := internal.CtxInitState(cmd.Context()) ctx := internal.CtxInitState(cmd.Context())
isStartup := check == "startup" isStartup := check == "startup"
resp, err := getStatus(ctx, isStartup, isStartup) resp, err := getStatus(ctx, isStartup, false)
if err != nil { if err != nil {
return err return err
} }

30
client/netbird-entrypoint.sh
View File

@@ -2,7 +2,6 @@
set -eEuo pipefail set -eEuo pipefail
: ${NB_ENTRYPOINT_SERVICE_TIMEOUT:="30"} : ${NB_ENTRYPOINT_SERVICE_TIMEOUT:="30"}
: ${NB_ENTRYPOINT_LOGIN_TIMEOUT:="30"}
NETBIRD_BIN="${NETBIRD_BIN:-"netbird"}" NETBIRD_BIN="${NETBIRD_BIN:-"netbird"}"
export NB_LOG_FILE="${NB_LOG_FILE:-"console,/var/log/netbird/client.log"}" export NB_LOG_FILE="${NB_LOG_FILE:-"console,/var/log/netbird/client.log"}"
service_pids=() service_pids=()
@@ -51,31 +50,10 @@ wait_for_daemon_startup() {
exit 1 exit 1
} }
login_if_needed() { connect() {
local timeout="${1}" info "running 'netbird up'..."
if "${NETBIRD_BIN}" status --check ready 2>/dev/null; then
info "already logged in, skipping 'netbird up'..."
return
fi
if [[ "${timeout}" -eq 0 ]]; then
info "logging in..."
"${NETBIRD_BIN}" up
return
fi
local deadline=$((SECONDS + timeout))
while [[ "${SECONDS}" -lt "${deadline}" ]]; do
if "${NETBIRD_BIN}" status --check ready 2>/dev/null; then
info "already logged in, skipping 'netbird up'..."
return
fi
sleep 1
done
info "logging in..."
"${NETBIRD_BIN}" up "${NETBIRD_BIN}" up
return $?
} }
main() { main() {
@@ -85,7 +63,7 @@ main() {
info "registered new service process 'netbird service run', currently running: ${service_pids[@]@Q}" info "registered new service process 'netbird service run', currently running: ${service_pids[@]@Q}"
wait_for_daemon_startup "${NB_ENTRYPOINT_SERVICE_TIMEOUT}" wait_for_daemon_startup "${NB_ENTRYPOINT_SERVICE_TIMEOUT}"
login_if_needed "${NB_ENTRYPOINT_LOGIN_TIMEOUT}" connect
wait "${service_pids[@]}" wait "${service_pids[@]}"
} }