diff --git a/.env.example b/.env.example index 6b8a5a6..ffd5f84 100644 --- a/.env.example +++ b/.env.example @@ -9,3 +9,7 @@ BAMBOO_TOKEN= # Folder for this agent's WireGuard key. #BAMBOO_DATA=./bamboo-data + +# Check for new releases every few hours and update and restart by itself (Linux and macOS). +# setup.sh turns this on; remove it to update by hand. +#BAMBOO_AUTO_UPDATE=1 diff --git a/README.md b/README.md index 54be7c8..1be837d 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,10 @@ sudo systemctl start bamboo Use `linux_arm64` or `linux_arm` for Raspberry Pi and other ARM machines. To upgrade, repeat the same steps: your settings and data are kept. `sudo ./install.sh --uninstall` removes the service and binary but leaves `/etc/bamboo` and `/var/lib/bamboo` alone. `bamboo -version` tells you which build is running. +**Updates** + +Set `BAMBOO_AUTO_UPDATE=1` (or pass `-auto-update`) and Bamboo checks this server for a newer release every few hours, verifies it against `SHA256SUMS`, checks that the new binary runs, swaps it in and restarts itself. It only follows full releases (never pre-releases), never downgrades, and keeps the old binary if anything looks wrong. `setup.sh` turns it on. It is not available on Windows, and it is for the systemd and plain-binary installs: with Docker, pull a new image instead. + **With Docker** ``` diff --git a/cmd/bamboo/main.go b/cmd/bamboo/main.go index 7683334..194e9c4 100644 --- a/cmd/bamboo/main.go +++ b/cmd/bamboo/main.go @@ -11,6 +11,7 @@ import ( "git.veillax.com/Veillax/bamboo" "git.veillax.com/Veillax/reef/dotenv" + "git.veillax.com/Veillax/reef/selfupdate" ) // version is set at build time (deploy/build.sh). @@ -34,6 +35,7 @@ func main() { data := flag.String("data", env("BAMBOO_DATA", "./bamboo-data"), "directory for this agent's WireGuard key") dockerOn := flag.Bool("docker", os.Getenv("BAMBOO_DOCKER") == "1", "report local Docker containers so they can be picked as targets in the UI") flag.String("env", ".env", "file to read secrets and settings from") + autoUpdate := flag.Bool("auto-update", os.Getenv("BAMBOO_AUTO_UPDATE") == "1", "check for new releases every few hours and update and restart by itself (Linux and macOS)") showVersion := flag.Bool("version", false, "print the version and exit") flag.Parse() if *showVersion { @@ -47,6 +49,9 @@ func main() { log.Printf("bamboo %s starting", version) ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt) defer stop() + if *autoUpdate { + go selfupdate.Run(ctx, selfupdate.Config{Server: "https://git.veillax.com", Repo: "Veillax/bamboo", App: "bamboo", Current: version, Logf: log.Printf}) + } b, err := bamboo.New(bamboo.Config{Hammerhead: strings.TrimRight(*hh, "/"), Token: *token, DataDir: *data, Docker: *dockerOn}) if err != nil { log.Fatal(err) diff --git a/deploy/bamboo.service b/deploy/bamboo.service index 3ca444a..e5cbe8e 100644 --- a/deploy/bamboo.service +++ b/deploy/bamboo.service @@ -8,7 +8,7 @@ Wants=network-online.target User=bamboo Group=bamboo EnvironmentFile=-/etc/bamboo/bamboo.env -ExecStart=/usr/local/bin/bamboo -data /var/lib/bamboo +ExecStart=/usr/local/lib/bamboo/bamboo -data /var/lib/bamboo WorkingDirectory=/var/lib/bamboo Restart=on-failure RestartSec=3 @@ -16,7 +16,7 @@ RestartSec=3 # It makes outbound connections only, so it needs no privileges at all. NoNewPrivileges=true ProtectSystem=strict -ReadWritePaths=/var/lib/bamboo +ReadWritePaths=/var/lib/bamboo /usr/local/lib/bamboo ProtectHome=true PrivateTmp=true ProtectKernelTunables=true diff --git a/deploy/install.sh b/deploy/install.sh index ee0a3e3..4ef0edb 100644 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -5,7 +5,7 @@ # sudo ./install.sh --start the same, then start (or restart) the service # sudo ./install.sh --uninstall remove the service and binary (keeps the settings and data) # -# Files: /usr/local/bin/bamboo, /etc/systemd/system/bamboo.service, +# Files: /usr/local/lib/bamboo/bamboo (linked from /usr/local/bin/bamboo), /etc/systemd/system/bamboo.service, # /etc/bamboo/bamboo.env (your settings and secrets), /var/lib/bamboo (data). # Set DESTDIR=/some/dir to stage everything there without touching the system. set -eu @@ -17,6 +17,7 @@ UNIT=$ROOT/etc/systemd/system/$NAME.service CONF=$ROOT/etc/$NAME ENVFILE=$CONF/$NAME.env DATA=$ROOT/var/lib/$NAME +LIB=$ROOT/usr/local/lib/$NAME # the program lives here, owned by the service, so auto-update can replace it say() { printf '%s\n' "$*"; } real() { [ -z "${DESTDIR:-}" ]; } # are we touching the real system? @@ -30,7 +31,7 @@ if [ "${1:-}" = "--uninstall" ]; then if real; then systemctl disable --now "$NAME" > /dev/null 2>&1 || true fi - rm -f "$UNIT" "$BIN" + rm -f "$UNIT" "$BIN" "$LIB/$NAME" if real; then systemctl daemon-reload || true fi @@ -46,15 +47,18 @@ if real && ! id "$NAME" > /dev/null 2>&1; then fi mkdir -p "$ROOT/usr/local/bin" "$ROOT/etc/systemd/system" "$CONF" "$DATA" -install -m 0755 "$HERE/$NAME" "$BIN.new" -mv -f "$BIN.new" "$BIN" # atomic, so upgrading a running service is safe +mkdir -p "$LIB" +install -m 0755 "$HERE/$NAME" "$LIB/$NAME.new" +mv -f "$LIB/$NAME.new" "$LIB/$NAME" # atomic, so upgrading a running service is safe +rm -f "$BIN" +ln -s "/usr/local/lib/$NAME/$NAME" "$BIN" install -m 0644 "$HERE/$NAME.service" "$UNIT" if [ ! -f "$ENVFILE" ]; then install -m 0600 "$HERE/.env.example" "$ENVFILE" say "Created $ENVFILE. Edit it before starting." fi if real; then - chown -R "$NAME:$NAME" "$DATA" + chown -R "$NAME:$NAME" "$DATA" "$LIB" fi if real; then @@ -66,7 +70,7 @@ if real; then fi fi -say "Installed $("$BIN" -version 2> /dev/null || echo "$NAME")." +say "Installed $("$LIB/$NAME" -version 2> /dev/null || echo "$NAME")." say "Next:" say " 1. edit $ENVFILE" say " 2. systemctl start $NAME (or run this again with --start)" diff --git a/go.mod b/go.mod index f6a766a..949f9c8 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module git.veillax.com/Veillax/bamboo go 1.27.3 -require git.veillax.com/Veillax/reef v0.1.0 +require git.veillax.com/Veillax/reef v0.1.3 require ( github.com/Microsoft/go-winio v0.6.4 // indirect diff --git a/go.sum b/go.sum index 9806b74..4e37399 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ git.veillax.com/Veillax/reef v0.1.0 h1:O0OhEKFx2CsvACJ20sfzJNjGsngomtfDdKdxu4ROpCs= git.veillax.com/Veillax/reef v0.1.0/go.mod h1:ZBUd/BARO5kkpUNTP81TTY1aQXLHFR6bKDhCxckjHso= +git.veillax.com/Veillax/reef v0.1.3 h1:RxSq2xwaup1+MieAkhlvOTZnYwPf19thFHEAe/7VxsI= +git.veillax.com/Veillax/reef v0.1.3/go.mod h1:ZBUd/BARO5kkpUNTP81TTY1aQXLHFR6bKDhCxckjHso= github.com/Microsoft/go-winio v0.6.4 h1:kJF2pamtYCWXf0xAT8sAkwKC0pMl2HYBrRPHAqyUc+g= github.com/Microsoft/go-winio v0.6.4/go.mod h1:1xl5JXG4ze/m74GH6Dc4Mwxfc3VL5siRVQjIAlHH07U= github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=