jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2025-12-17 02:36:17 +01:00
Code Issues Packages Projects Releases 2 Wiki Activity

refactor: async docker version check

Browse Source
This commit is contained in:
henrygd
2025-10-07 15:33:46 -04:00
parent 612ad1238f
commit 1623f5e751
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
agent/docker.go
View File

@@ -474,15 +474,26 @@ func newDockerManager(a *Agent) *dockerManager {
return manager return manager
} }
// Check docker version // this can take up to 5 seconds with retry, so run in goroutine
// (versions before 25.0.0 have a bug with one-shot which requires all requests to be made in one batch) go manager.checkDockerVersion()
// give version check a chance to complete before returning
time.Sleep(50 * time.Millisecond)
return manager
}
// checkDockerVersion checks Docker version and sets goodDockerVersion if at least 25.0.0.
// Versions before 25.0.0 have a bug with one-shot which requires all requests to be made in one batch.
func (dm *dockerManager) checkDockerVersion() {
var err error
var resp *http.Response
var versionInfo struct { var versionInfo struct {
Version string `json:"Version"` Version string `json:"Version"`
} }
var resp *http.Response
const versionMaxTries = 2 const versionMaxTries = 2
for i := 1; i <= versionMaxTries; i++ { for i := 1; i <= versionMaxTries; i++ {
resp, err = manager.client.Get("http://localhost/version") resp, err = dm.client.Get("http://localhost/version")
if err == nil { if err == nil {
break break
} }
@@ -495,21 +506,17 @@ func newDockerManager(a *Agent) *dockerManager {
} }
} }
if err != nil { if err != nil {
return manager return
} }
if err := dm.decode(resp, &versionInfo); err != nil {
if err := manager.decode(resp, &versionInfo); err != nil { return
return manager
} }
// if version > 24, one-shot works correctly and we can limit concurrent operations // if version > 24, one-shot works correctly and we can limit concurrent operations
if dockerVersion, err := semver.Parse(versionInfo.Version); err == nil && dockerVersion.Major > 24 { if dockerVersion, err := semver.Parse(versionInfo.Version); err == nil && dockerVersion.Major > 24 {
manager.goodDockerVersion = true dm.goodDockerVersion = true
} else { } else {
slog.Info(fmt.Sprintf("Docker %s is outdated. Upgrade if possible. See https://github.com/henrygd/beszel/issues/58", versionInfo.Version)) slog.Info(fmt.Sprintf("Docker %s is outdated. Upgrade if possible. See https://github.com/henrygd/beszel/issues/58", versionInfo.Version))
} }
return manager
} }
// Decodes Docker API JSON response using a reusable buffer and decoder. Not thread safe. // Decodes Docker API JSON response using a reusable buffer and decoder. Not thread safe.