Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
feat: self update digest tracking and fixes (#919)
Chase Baucom4bc6689e44eb
diff --git a/README.md b/README.mdindex 05010b86d..316eefc4a 100644--- a/README.md+++ b/README.md@@ -1,5 +1,5 @@> [!IMPORTANT]-> All Arcane repos have moved to the [@getarcaneapp](https://github.com/getarcaneapp) org on GitHub.+> All Arcane repos have moved to the [@getarcaneapp](https://github.com/getarcaneapp) org on GitHub.>> This means the images used for Arcane for all future releases (past 1.7.2) will use the following repositories:>@@ -8,6 +8,7 @@> Arcane Agent: `ghcr.io/getarcaneapp/arcane-headless`<div align="center">+<img src=".github/assets/img/PNG-3.png" alt="Arcane Logo" width="500" /><p>Modern Docker Management, Designed for Everyone.</p>@@ -19,10 +20,6 @@<img width="1685" alt="image" align="center" src=".github/assets/arcane.jpeg" />-</div>------## Documentation@@ -38,3 +35,5 @@ Help translate Arcane on Crowdin: https://crowdin.com/project/arcane-docker-mana---Thank you for checking out Arcane! Your feedback and contributions are always welcome.++</div>diff --git a/backend/internal/bootstrap/services_bootstrap.go b/backend/internal/bootstrap/services_bootstrap.goindex 8af60a448..3949ae744 100644--- a/backend/internal/bootstrap/services_bootstrap.go+++ b/backend/internal/bootstrap/services_bootstrap.go@@ -67,7 +67,7 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.Configsvcs.Oidc = services.NewOidcService(svcs.Auth, cfg, httpClient)svcs.Updater = services.NewUpdaterService(db, svcs.Settings, svcs.Docker, svcs.Project, svcs.ImageUpdate, svcs.ContainerRegistry, svcs.Event, svcs.Image, svcs.Notification)svcs.System = services.NewSystemService(db, svcs.Docker, svcs.Container, svcs.Image, svcs.Volume, svcs.Network, svcs.Settings)- svcs.Version = services.NewVersionService(httpClient, cfg.UpdateCheckDisabled, config.Version, config.Revision)+ svcs.Version = services.NewVersionService(httpClient, cfg.UpdateCheckDisabled, config.Version, config.Revision, svcs.ContainerRegistry, svcs.Docker)svcs.SystemUpgrade = services.NewSystemUpgradeService(svcs.Docker, svcs.Version, svcs.Event)return svcs, dockerClient, nildiff --git a/backend/internal/cli/upgrade/upgrade.go b/backend/internal/cli/upgrade/upgrade.goindex ea8f9ea97..c18fd65d0 100644--- a/backend/internal/cli/upgrade/upgrade.go+++ b/backend/internal/cli/upgrade/upgrade.go@@ -35,7 +35,7 @@ This command should be run from outside the container (e.g., from the host or anarcane upgrade --container arcane# Upgrade to a specific image tag- arcane upgrade --container arcane --image ghcr.io/ofkm/arcane:v1.2.3`,+ arcane upgrade --container arcane --image ghcr.io/getarcaneapp/arcane:v1.2.3`,// Use background context to ignore signals during upgrade// This prevents the upgrade from being interrupted when the target container stopsRunE: runUpgrade,@@ -309,7 +309,7 @@ func inferImageNameFromDocker(ctx context.Context, dockerClient *client.Client,// ensureDefaultTag adds :latest tag if no tag is presentfunc ensureDefaultTag(imageName string) string {if imageName == "" {- return "ghcr.io/ofkm/arcane:latest"+ return "ghcr.io/getarcaneapp/arcane:latest"}return imageName + ":latest"}diff --git a/backend/internal/dto/version_dto.go b/backend/internal/dto/version_dto.goindex 8c00182c8..41bab2fd8 100644--- a/backend/internal/dto/version_dto.go+++ b/backend/internal/dto/version_dto.go@@ -2,10 +2,13 @@ package dtotype VersionInfoDto struct {CurrentVersion string `json:"currentVersion"`+ CurrentTag string `json:"currentTag,omitempty"`+ CurrentDigest string `json:"currentDigest,omitempty"`Revision string `json:"revision"`DisplayVersion string `json:"displayVersion"`IsSemverVersion bool `json:"isSemverVersion"`NewestVersion string `json:"newestVersion,omitempty"`+ NewestDigest string `json:"newestDigest,omitempty"`UpdateAvailable bool `json:"updateAvailable"`ReleaseURL string `json:"releaseUrl,omitempty"`}diff --git a/backend/internal/services/container_registry_service.go b/backend/internal/services/container_registry_service.goindex 756d78b3f..8d592b5d4 100644--- a/backend/internal/services/container_registry_service.go+++ b/backend/internal/services/container_registry_service.go@@ -2,23 +2,54 @@ package servicesimport ("context"+ "encoding/json"+ "errors""fmt"+ "log/slog"+ "net/http""strings"+ "sync""time"+ ref "github.com/distribution/reference""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/dto""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils"+ "github.com/getarcaneapp/arcane/backend/internal/utils/cache""github.com/getarcaneapp/arcane/backend/internal/utils/pagination"+ "github.com/getarcaneapp/arcane/backend/internal/utils/registry")+const (+ registryCheckTimeout = 10 * time.Second+ registryCacheTTL = 30 * time.Minute+)++func getHeaderCaseInsensitive(h http.Header, key string) string {+ for k, v := range h {+ if strings.EqualFold(k, key) && len(v) > 0 {+ return v[0]+ }+ }+ return ""+}+type ContainerRegistryService struct {- db *database.DB+ db *database.DB+ httpClient *http.Client+ cache map[string]*cache.Cache[string] // imageRef -> digest cache+ cacheMu sync.RWMutex}func NewContainerRegistryService(db *database.DB) *ContainerRegistryService {- return &ContainerRegistryService{db: db}+ return &ContainerRegistryService{+ db: db,+ httpClient: &http.Client{+ Timeout: registryCheckTimeout,+ },+ cache: make(map[string]*cache.Cache[string]),+ }}func (s *ContainerRegistryService) GetAllRegistries(ctx context.Context) ([]models.ContainerRegistry, error) {@@ -168,6 +199,203 @@ func (s *ContainerRegistryService) GetEnabledRegistries(ctx context.Context) ([]return registries, nil}+// GetImageDigest fetches the current digest for an image:tag from the registry+// This is used for digest-based update detection for non-semver tags+func (s *ContainerRegistryService) GetImageDigest(ctx context.Context, imageRef string) (string, error) {+ repository, tag := parseImageReference(imageRef)+ if repository == "" || tag == "" {+ return "", fmt.Errorf("invalid image reference: %s", imageRef)+ }++ // Build a cache key from the full image reference+ cacheKey := fmt.Sprintf("%s:%s", repository, tag)++ // Get or create a cache for this specific image reference+ s.cacheMu.RLock()+ imageCache, exists := s.cache[cacheKey]+ s.cacheMu.RUnlock()++ if !exists {+ s.cacheMu.Lock()+ if imageCache, exists = s.cache[cacheKey]; !exists {+ imageCache = cache.New[string](registryCacheTTL)+ s.cache[cacheKey] = imageCache+ }+ s.cacheMu.Unlock()+ }++ digest, err := imageCache.GetOrFetch(ctx, func(ctx context.Context) (string, error) {+ return s.fetchDigestFromRegistry(ctx, repository, tag)+ })++ var staleErr *cache.ErrStale+ if err != nil && !errors.As(err, &staleErr) {+ return "", err+ }++ return digest, nil+}++// fetchDigestFromRegistry queries the Docker registry API for the image digest+func (s *ContainerRegistryService) fetchDigestFromRegistry(ctx context.Context, repository, tag string) (string, error) {+ registryURL, repoPath := parseRegistryAndRepo(repository)+ manifestURL := fmt.Sprintf("%s/v2/%s/manifests/%s", registryURL, repoPath, tag)++ reqCtx, cancel := context.WithTimeout(ctx, registryCheckTimeout)+ defer cancel()++ req, err := http.NewRequestWithContext(reqCtx, http.MethodHead, manifestURL, nil)+ if err != nil {+ return "", fmt.Errorf("create registry request: %w", err)+ }++ req.Header.Set("Accept", "application/vnd.docker.distribution.manifest.v2+json, application/vnd.oci.image.manifest.v1+json, application/vnd.docker.distribution.manifest.list.v2+json")++ // Try to find stored credentials for this registry+ creds := s.findCredentialsForRegistry(ctx, registryURL)+ if creds != nil {+ req.SetBasicAuth(creds.Username, creds.Token)+ }++ resp, err := s.httpClient.Do(req)+ if err != nil {+ return "", fmt.Errorf("registry request failed: %w", err)+ }+ defer resp.Body.Close()++ if resp.StatusCode == http.StatusUnauthorized {+ return s.fetchWithTokenAuth(ctx, repository, tag, getHeaderCaseInsensitive(resp.Header, "WWW-Authenticate"), creds)+ }++ if resp.StatusCode != http.StatusOK {+ return "", fmt.Errorf("registry returned status %d", resp.StatusCode)+ }++ digest := resp.Header.Get("Docker-Content-Digest")+ if digest == "" {+ digest = strings.Trim(resp.Header.Get("Etag"), "\"")+ }++ if digest == "" {+ return "", fmt.Errorf("no digest found in registry response")+ }++ return digest, nil+}++// findCredentialsForRegistry finds stored credentials for a registry URL+func (s *ContainerRegistryService) findCredentialsForRegistry(ctx context.Context, registryURL string) *struct{ Username, Token string } {+ registries, err := s.GetEnabledRegistries(ctx)+ if err != nil {+ return nil+ }++ // Normalize registry URL for comparison+ normalizedURL := strings.TrimPrefix(registryURL, "https://")+ normalizedURL = strings.TrimPrefix(normalizedURL, "http://")++ for _, reg := range registries {+ regURL := strings.TrimPrefix(reg.URL, "https://")+ regURL = strings.TrimPrefix(regURL, "http://")++ if strings.Contains(normalizedURL, regURL) || strings.Contains(regURL, normalizedURL) {+ token, err := utils.Decrypt(reg.Token)+ if err != nil {+ slog.WarnContext(ctx, "Failed to decrypt registry token", "registry", reg.URL, "error", err)+ continue+ }+ return &struct{ Username, Token string }{Username: reg.Username, Token: token}+ }+ }++ return nil+}++// fetchWithTokenAuth handles token-based authentication for registries+func (s *ContainerRegistryService) fetchWithTokenAuth(ctx context.Context, repository, tag, wwwAuth string, creds *struct{ Username, Token string }) (string, error) {+ realm, service := parseWWWAuth(wwwAuth)+ if realm == "" {+ return "", fmt.Errorf("no auth realm found")+ }++ registryURL, repoPath := parseRegistryAndRepo(repository)++ tokenURL := fmt.Sprintf("%s?service=%s&scope=repository:%s:pull", realm, service, repoPath)++ reqCtx, cancel := context.WithTimeout(ctx, registryCheckTimeout)+ defer cancel()++ tokenReq, err := http.NewRequestWithContext(reqCtx, http.MethodGet, tokenURL, nil)+ if err != nil {+ return "", fmt.Errorf("create token request: %w", err)+ }++ if creds != nil {+ tokenReq.SetBasicAuth(creds.Username, creds.Token)+ }++ tokenResp, err := s.httpClient.Do(tokenReq)+ if err != nil {+ return "", fmt.Errorf("token request failed: %w", err)+ }+ defer tokenResp.Body.Close()++ if tokenResp.StatusCode != http.StatusOK {+ return "", fmt.Errorf("token request returned status %d", tokenResp.StatusCode)+ }++ var tokenData struct {+ Token string `json:"token"`+ AccessToken string `json:"access_token"`+ }+ if err := json.NewDecoder(tokenResp.Body).Decode(&tokenData); err != nil {+ return "", fmt.Errorf("decode token response: %w", err)+ }++ token := tokenData.Token+ if token == "" {+ token = tokenData.AccessToken+ }+ if token == "" {+ return "", fmt.Errorf("no token in response")+ }++ // Retry with token+ manifestURL := fmt.Sprintf("%s/v2/%s/manifests/%s", registryURL, repoPath, tag)++ reqCtx2, cancel2 := context.WithTimeout(ctx, registryCheckTimeout)+ defer cancel2()++ req, err := http.NewRequestWithContext(reqCtx2, http.MethodHead, manifestURL, nil)+ if err != nil {+ return "", fmt.Errorf("create authenticated request: %w", err)+ }++ req.Header.Set("Authorization", "Bearer "+token)+ req.Header.Set("Accept", "application/vnd.docker.distribution.manifest.v2+json, application/vnd.oci.image.manifest.v1+json, application/vnd.docker.distribution.manifest.list.v2+json")++ resp, err := s.httpClient.Do(req)+ if err != nil {+ return "", fmt.Errorf("authenticated request failed: %w", err)+ }+ defer resp.Body.Close()++ if resp.StatusCode != http.StatusOK {+ return "", fmt.Errorf("authenticated request returned status %d", resp.StatusCode)+ }++ digest := resp.Header.Get("Docker-Content-Digest")+ if digest == "" {+ digest = strings.Trim(resp.Header.Get("Etag"), "\"")+ }++ if digest == "" {+ return "", fmt.Errorf("no digest found in authenticated response")+ }++ return digest, nil+}+// SyncRegistries syncs registries from a manager to this agent instance// It creates, updates, or deletes registries to match the provided listfunc (s *ContainerRegistryService) SyncRegistries(ctx context.Context, syncItems []dto.ContainerRegistrySyncDto) error {@@ -280,3 +508,46 @@ func (s *ContainerRegistryService) deleteUnsyncedInternal(ctx context.Context, e}return nil}++// parseImageReference splits an image reference into repository and tag using distribution/reference+func parseImageReference(imageRef string) (repository, tag string) {+ named, err := ref.ParseNormalizedNamed(imageRef)+ if err != nil {+ return imageRef, "latest"+ }++ tagged, ok := named.(ref.Tagged)+ if ok {+ tag = tagged.Tag()+ } else {+ tag = "latest"+ }++ return named.Name(), tag+}++// parseRegistryAndRepo splits a repository into registry URL and repo path using distribution/reference+func parseRegistryAndRepo(repository string) (registryURL, repoPath string) {+ named, err := ref.ParseNormalizedNamed(repository)+ if err != nil {+ return "https://registry-1.docker.io", "library/" + repository+ }++ domain := ref.Domain(named)+ repoPath = ref.Path(named)++ registryURL, err = registry.GetRegistryAddress(named.Name())+ if err != nil {+ registryURL = "https://" + domain+ } else {+ registryURL = "https://" + registryURL+ }++ return registryURL, repoPath+}++// parseWWWAuth parses the WWW-Authenticate header using the registry client+func parseWWWAuth(header string) (realm, service string) {+ c := registry.NewClient()+ return c.ParseAuthChallenge(header)+}diff --git a/backend/internal/services/notification_service.go b/backend/internal/services/notification_service.goindex 3b44cdb05..678aa7a4f 100644--- a/backend/internal/services/notification_service.go+++ b/backend/internal/services/notification_service.go@@ -394,7 +394,7 @@ func (s *NotificationService) sendEmailNotification(ctx context.Context, imageRefunc (s *NotificationService) renderEmailTemplate(imageRef string, updateInfo *dto.ImageUpdateResponse) (string, string, error) {data := map[string]interface{}{- "LogoURL": "https://raw.githubusercontent.com/ofkm/arcane/main/backend/resources/images/logo-full.svg",+ "LogoURL": "https://raw.githubusercontent.com/getarcaneapp/arcane/main/backend/resources/images/logo-full.svg","AppURL": s.config.AppUrl,"ImageRef": imageRef,"HasUpdate": updateInfo.HasUpdate,@@ -990,7 +990,7 @@ func (s *NotificationService) sendBatchEmailNotification(ctx context.Context, upfunc (s *NotificationService) renderBatchEmailTemplate(updates map[string]*dto.ImageUpdateResponse) (string, string, error) {data := map[string]interface{}{- "LogoURL": "https://raw.githubusercontent.com/ofkm/arcane/main/backend/resources/images/logo-full.svg",+ "LogoURL": "https://raw.githubusercontent.com/getarcaneapp/arcane/main/backend/resources/images/logo-full.svg","AppURL": s.config.AppUrl,"UpdateCount": len(updates),"CheckTime": time.Now().Format(time.RFC1123),diff --git a/backend/internal/services/system_service.go b/backend/internal/services/system_service.goindex eda5f93e5..63f416a4d 100644--- a/backend/internal/services/system_service.go+++ b/backend/internal/services/system_service.go@@ -268,7 +268,7 @@ func (s *SystemService) StopAllContainers(ctx context.Context) (*dto.ContainerAcreturn s.performBatchContainerAction(ctx, containers, "stop",func(c container.Summary) bool {// Skip Arcane server container- return c.Labels == nil || c.Labels["com.ofkm.arcane.server"] != "true"+ return c.Labels == nil || c.Labels["com.getarcaneapp.arcane.server"] != "true"},func(ctx context.Context, id string) error {return s.containerService.StopContainer(ctx, id, systemUser)diff --git a/backend/internal/services/system_upgrade_service.go b/backend/internal/services/system_upgrade_service.goindex 6940f1acf..0a856cea9 100644--- a/backend/internal/services/system_upgrade_service.go+++ b/backend/internal/services/system_upgrade_service.go@@ -4,6 +4,7 @@ import ("context""errors""fmt"+ "io""log/slog""os""strings"@@ -12,6 +13,7 @@ import (containertypes "github.com/docker/docker/api/types/container""github.com/docker/docker/api/types/filters"+ imagetypes "github.com/docker/docker/api/types/image""github.com/getarcaneapp/arcane/backend/internal/models")@@ -96,9 +98,8 @@ func (s *SystemUpgradeService) TriggerUpgradeViaCLI(ctx context.Context, user moslog.Warn("Failed to log upgrade event", "error", err)}- // Use the official Arcane image for the upgrader container- // This ensures we always use the packaged CLI from the official image- upgraderImage := "ghcr.io/ofkm/arcane:latest"+ // Use latest tag for the upgrader CLI container+ upgraderImage := "ghcr.io/getarcaneapp/arcane:latest"slog.Info("Spawning upgrade CLI command","containerName", containerName,@@ -112,6 +113,17 @@ func (s *SystemUpgradeService) TriggerUpgradeViaCLI(ctx context.Context, user moreturn fmt.Errorf("failed to connect to Docker: %w", err)}+ // Pull the upgrader image first to ensure it exists+ slog.Info("Pulling upgrader image", "image", upgraderImage)+ pullReader, err := dockerClient.ImagePull(ctx, upgraderImage, imagetypes.PullOptions{})+ if err != nil {+ return fmt.Errorf("pull upgrader image: %w", err)+ }+ // Drain the reader to complete the pull+ _, _ = io.Copy(io.Discard, pullReader)+ pullReader.Close()+ slog.Info("Upgrader image pulled successfully", "image", upgraderImage)+// Create the upgrader container configconfig := &containertypes.Config{Image: upgraderImage,@@ -241,7 +253,7 @@ func (s *SystemUpgradeService) findArcaneContainer(ctx context.Context, containe// Fallback: search for containers with arcane imagefilter := filters.NewArgs()- filter.Add("ancestor", "ofkm/arcane")+ filter.Add("ancestor", "ghcr.io/getarcaneapp/arcane")containers, err := dockerClient.ContainerList(ctx, containertypes.ListOptions{All: true,diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex fcc321663..138130acf 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -146,6 +146,8 @@ func (s *UpdaterService) ApplyPending(ctx context.Context, dryRun bool) (*dto.Up}// Pull images with ImageService (waits for completion)+ newImageIDs := map[string][]string{} // newRef -> []imageIDs after pull+for _, p := range plans {item := dto.UpdaterItem{ResourceID: p.oldRef,@@ -181,6 +183,15 @@ func (s *UpdaterService) ApplyPending(ctx context.Context, dryRun bool) (*dto.Upitem.Status = "updated"item.UpdateApplied = trueout.Updated+++ newIDs, _ := s.resolveLocalImageIDsForRef(ctx, p.newRef)+ if len(newIDs) > 0 {+ newImageIDs[p.newRef] = newIDs+ for _, newID := range newIDs {+ if newID != "" {+ oldIDToNewRef[newID] = p.newRef+ }+ }+ }}out.Items = append(out.Items, item)_ = s.recordRun(ctx, item)@@ -462,7 +473,7 @@ func (s *UpdaterService) stripDigest(ref string) string {return ref}-const arcaneUpdaterLabel = "com.ofkm.arcane.updater"+const arcaneUpdaterLabel = "com.getarcaneapp.arcane.updater"// isUpdateDisabled returns true if the special label is present and evaluates to false.// Accepts false/0/no/off (case-insensitive) as "disabled". Default is enabled.diff --git a/backend/internal/services/version_service.go b/backend/internal/services/version_service.goindex 73eb49e8f..cd4589f21 100644--- a/backend/internal/services/version_service.go+++ b/backend/internal/services/version_service.go@@ -7,37 +7,43 @@ import ("fmt""log/slog""net/http"+ "os""strings""time"+ ref "github.com/distribution/reference""github.com/getarcaneapp/arcane/backend/internal/dto""github.com/getarcaneapp/arcane/backend/internal/utils/cache")const (versionTTL = 3 * time.Hour- versionCheckURL = "https://api.github.com/repos/ofkm/arcane/releases/latest"+ versionCheckURL = "https://api.github.com/repos/getarcaneapp/arcane/releases/latest"defaultRequestTimeout = 5 * time.Second)type VersionService struct {- httpClient *http.Client- cache *cache.Cache[string]- disabled bool- version string- revision string+ httpClient *http.Client+ cache *cache.Cache[string]+ disabled bool+ version string+ revision string+ containerRegistryService *ContainerRegistryService+ dockerService *DockerClientService}-func NewVersionService(httpClient *http.Client, disabled bool, version string, revision string) *VersionService {+func NewVersionService(httpClient *http.Client, disabled bool, version string, revision string, containerRegistryService *ContainerRegistryService, dockerService *DockerClientService) *VersionService {if httpClient == nil {httpClient = http.DefaultClient}return &VersionService{- httpClient: httpClient,- cache: cache.New[string](versionTTL),- disabled: disabled,- version: version,- revision: revision,+ httpClient: httpClient,+ cache: cache.New[string](versionTTL),+ disabled: disabled,+ version: version,+ revision: revision,+ containerRegistryService: containerRegistryService,+ dockerService: dockerService,}}@@ -99,13 +105,14 @@ func (s *VersionService) IsNewer(latest, current string) bool {func (s *VersionService) ReleaseURL(version string) string {if strings.TrimSpace(version) == "" {- return "https://github.com/ofkm/arcane/releases/latest"+ return "https://github.com/getarcaneapp/arcane/releases/latest"}+v := strings.TrimSpace(version)if !strings.HasPrefix(v, "v") {v = "v" + v}- return "https://github.com/ofkm/arcane/releases/tag/" + v+ return "https://github.com/getarcaneapp/arcane/releases/tag/" + v}type VersionInformation struct {@@ -205,9 +212,14 @@ func (s *VersionService) GetAppVersionInfo(ctx context.Context) *dto.VersionInfodisplayVersion := s.getDisplayVersion()isSemver := s.isSemverVersion()+ // Detect current container image tag, digest, and registry+ currentTag, currentDigest, currentImageRef := s.detectCurrentImageInfo(ctx)+if s.disabled {return &dto.VersionInfoDto{CurrentVersion: version,+ CurrentTag: currentTag,+ CurrentDigest: currentDigest,DisplayVersion: displayVersion,Revision: s.revision,IsSemverVersion: isSemver,@@ -215,29 +227,184 @@ func (s *VersionService) GetAppVersionInfo(ctx context.Context) *dto.VersionInfo}}- latest, err := s.GetLatestVersion(ctx)- if err != nil {- var staleErr *cache.ErrStale- if !errors.As(err, &staleErr) {- return &dto.VersionInfoDto{- CurrentVersion: version,- DisplayVersion: displayVersion,- Revision: s.revision,- IsSemverVersion: isSemver,+ // For semver versions, check GitHub releases+ if isSemver {+ latest, err := s.GetLatestVersion(ctx)+ if err != nil {+ var staleErr *cache.ErrStale+ if !errors.As(err, &staleErr) {+ return &dto.VersionInfoDto{+ CurrentVersion: version,+ CurrentTag: currentTag,+ CurrentDigest: currentDigest,+ DisplayVersion: displayVersion,+ Revision: s.revision,+ IsSemverVersion: isSemver,+ }}+ slog.Warn("Failed to refresh latest version; using stale cache", "error", staleErr.Err)+ }++ return &dto.VersionInfoDto{+ CurrentVersion: version,+ CurrentTag: currentTag,+ CurrentDigest: currentDigest,+ DisplayVersion: displayVersion,+ Revision: s.revision,+ IsSemverVersion: isSemver,+ NewestVersion: latest,+ UpdateAvailable: s.IsNewer(latest, version),+ ReleaseURL: s.ReleaseURL(latest),+ }+ }++ // For non-semver versions (like "next"), check digest-based updates+ if currentTag != "" && s.containerRegistryService != nil {+ updateAvailable, latestDigest := s.checkDigestBasedUpdate(ctx, currentTag, currentDigest, currentImageRef)+ return &dto.VersionInfoDto{+ CurrentVersion: version,+ CurrentTag: currentTag,+ CurrentDigest: currentDigest,+ DisplayVersion: displayVersion,+ Revision: s.revision,+ IsSemverVersion: isSemver,+ NewestDigest: latestDigest,+ UpdateAvailable: updateAvailable,}- slog.Warn("Failed to refresh latest version; using stale cache", "error", staleErr.Err)}return &dto.VersionInfoDto{CurrentVersion: version,+ CurrentTag: currentTag,+ CurrentDigest: currentDigest,DisplayVersion: displayVersion,Revision: s.revision,IsSemverVersion: isSemver,- NewestVersion: latest,- UpdateAvailable: s.IsNewer(latest, version) && isSemver,- ReleaseURL: s.ReleaseURL(latest),+ UpdateAvailable: false,+ }+}++// detectCurrentImageInfo attempts to detect the current container's image tag and digest+func (s *VersionService) detectCurrentImageInfo(ctx context.Context) (tag string, digest string, imageRef string) {+ if s.dockerService == nil {+ return "", "", ""+ }++ // Try to get current container ID+ containerId, err := s.getCurrentContainerID()+ if err != nil {+ return "", "", ""+ }++ // Connect to Docker and inspect the container+ dockerClient, err := s.dockerService.GetClient()+ if err != nil {+ return "", "", ""+ }++ container, err := dockerClient.ContainerInspect(ctx, containerId)+ if err != nil {+ return "", "", ""}++ // Parse tag from container config image (user-specified reference)+ tag = s.extractTagFromImageRef(container.Config.Image)++ // Get digest and normalized imageRef from container image+ if container.Image != "" {+ imageInspect, err := dockerClient.ImageInspect(ctx, container.Image)+ if err == nil && len(imageInspect.RepoDigests) > 0 {+ // Extract digest and repository from first RepoDigest+ // Format: "ghcr.io/getarcaneapp/arcane@sha256:abc123..."+ // Use RepoDigests for imageRef as it contains the fully qualified registry path+ for _, repoDigest := range imageInspect.RepoDigests {+ if repo, dig, ok := strings.Cut(repoDigest, "@"); ok {+ imageRef = repo+ digest = dig+ break+ }+ }+ }+ }++ // Fallback to container config image if RepoDigests didn't provide imageRef+ if imageRef == "" {+ imageRef = container.Config.Image+ }++ return tag, digest, imageRef+}++// getCurrentContainerID detects if we're running in Docker and returns container ID+func (s *VersionService) getCurrentContainerID() (string, error) {+ // Try reading from /proc/self/cgroup (Linux)+ data, err := os.ReadFile("/proc/self/cgroup")+ if err != nil {+ return "", err+ }++ lines := strings.Split(string(data), "\n")+ for _, line := range lines {+ if strings.Contains(line, "docker") || strings.Contains(line, "containerd") {+ parts := strings.Split(line, "/")+ if len(parts) > 0 {+ id := strings.TrimSpace(parts[len(parts)-1])+ if len(id) >= 12 {+ return id, nil+ }+ }+ }+ }++ return "", errors.New("container ID not found")+}++// extractTagFromImageRef extracts the tag from an image reference using distribution/reference+func (s *VersionService) extractTagFromImageRef(imageRef string) string {+ named, err := ref.ParseNormalizedNamed(imageRef)+ if err != nil {+ return "latest"+ }++ tagged, ok := named.(ref.Tagged)+ if ok {+ return tagged.Tag()+ }++ return "latest"+}++// checkDigestBasedUpdate checks if there's a newer digest for the current tag+func (s *VersionService) checkDigestBasedUpdate(ctx context.Context, currentTag, currentDigest, currentImageRef string) (updateAvailable bool, latestDigest string) {+ if currentTag == "" || currentDigest == "" || currentImageRef == "" {+ return false, ""+ }++ // Build full image reference with tag+ imageRef := fmt.Sprintf("%s:%s", currentImageRef, currentTag)++ // Fetch latest digest from registry+ latestDigest, err := s.containerRegistryService.GetImageDigest(ctx, imageRef)+ if err != nil {+ slog.WarnContext(ctx, "Failed to fetch latest digest for tag",+ "tag", currentTag,+ "error", err,+ )+ return false, ""+ }++ // Compare digests - if they differ, an update is available+ updateAvailable = currentDigest != latestDigest && latestDigest != ""++ if updateAvailable {+ slog.InfoContext(ctx, "Digest-based update available",+ "tag", currentTag,+ "currentDigest", currentDigest,+ "latestDigest", latestDigest,+ )+ }++ return updateAvailable, latestDigest}func parseSemver(s string) [3]int {diff --git a/docker/Dockerfile b/docker/Dockerfileindex 6268d1571..358f2c3ee 100644--- a/docker/Dockerfile+++ b/docker/Dockerfile@@ -33,7 +33,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH \go build \-tags "${BUILD_TAGS}" \- -ldflags "-w -s -X github.com/ofkm/arcane-backend/internal/config.Version=${VERSION} -X github.com/ofkm/arcane-backend/internal/config.Revision=${REVISION}" \+ -ldflags "-w -s -X github.com/getarcaneapp/arcane/backend/internal/config.Version=${VERSION} -X github.com/getarcaneapp/arcane/backend/internal/config.Revision=${REVISION}" \-trimpath \-o /build/arcane \./cmd/main.go@@ -79,7 +79,7 @@ org.opencontainers.image.licenses="BSD-3-Clause" \org.opencontainers.image.ref.name="arcane" \org.opencontainers.image.title="Arcane" \org.opencontainers.image.description="Modern Docker Management, Made for Everyone" \-com.ofkm.arcane.updater="false" \-com.ofkm.arcane.server="true"+com.getarcaneapp.arcane.updater="false" \+com.getarcaneapp.arcane.server="true"CMD ["./arcane"]\ No newline at end of filediff --git a/docker/Dockerfile-agent b/docker/Dockerfile-agentindex aa34acbe2..c1e638911 100644--- a/docker/Dockerfile-agent+++ b/docker/Dockerfile-agent@@ -23,7 +23,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH \go build \-tags "${BUILD_TAGS}" \- -ldflags "-w -s -X github.com/ofkm/arcane-backend/internal/config.Version=${VERSION} -X github.com/ofkm/arcane-backend/internal/config.Revision=${REVISION}" \+ -ldflags "-w -s -X github.com/getarcaneapp/arcane/backend/internal/config.Version=${VERSION} -X github.com/getarcaneapp/arcane/backend/internal/config.Revision=${REVISION}" \-trimpath \-o /out/arcane-agent \./cmd/main.go@@ -69,8 +69,8 @@ LABEL org.opencontainers.image.ref.name="arcane-agent"LABEL org.opencontainers.image.title="Arcane Agent"LABEL org.opencontainers.image.description="Arcane Agent"-LABEL com.ofkm.arcane.updater="false"-LABEL com.ofkm.arcane.server="true"+LABEL com.getarcaneapp.arcane.updater="false"+LABEL com.getarcaneapp.arcane.server="true"EXPOSE 3553VOLUME ["/app/data"]diff --git a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelteindex f97dc959f..f2a46aaf9 100644--- a/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte+++ b/frontend/src/lib/components/sidebar/sidebar-updatebanner.svelte@@ -37,9 +37,34 @@const isAdmin = $derived(!!user?.roles?.includes('admin'));const shouldShowUpgrade = $derived((canUpgrade && isAdmin) || debug);++ // Determine update type and display text+ const updateType = $derived.by(() => {+ if (!versionInformation) return 'none';+ if (versionInformation.isSemverVersion) return 'semver';+ if (versionInformation.currentTag && versionInformation.newestDigest) return 'digest';+ return 'none';+ });++ const updateDisplayText = $derived.by(() => {+ if (!versionInformation) return '';+ if (updateType === 'semver') {+ return versionInformation.newestVersion ?? '';+ }+ if (updateType === 'digest' && versionInformation.newestDigest) {+ // Show shortened digest for non-semver tags+ const digest = versionInformation.newestDigest;+ return digest.length > 12 ? digest.substring(0, 12) : digest;+ }+ return '';+ });+const upgradeButtonText = $derived.by(() => {if (upgrading) return m.upgrade_in_progress();if (checkingUpgrade) return m.upgrade_checking();+ if (updateType === 'digest') {+ return `Update ${versionInformation?.currentTag ?? 'image'}`;+ }return m.upgrade_to_version({ version: versionInformation?.newestVersion ?? '' });});@@ -86,14 +111,26 @@}}- const shouldShowBanner = $derived((updateAvailable && versionInformation?.isSemverVersion) || debug);+ // Show banner for both semver and digest-based updates+ const shouldShowBanner = $derived(updateAvailable || debug);</script>{#snippet updateInfo()}<div class="flex flex-col gap-1"><span class="text-sm font-semibold">{m.sidebar_update_available()}</span>+ {#if versionInformation?.currentTag}+ <span class="text-xs text-blue-500/60">+ Tracking: {versionInformation.currentTag}+ </span>+ {/if}<span class="text-xs text-blue-500/80">- {m.sidebar_version({ version: versionInformation?.newestVersion ?? m.common_unknown() })}+ {#if updateType === 'semver'}+ {m.sidebar_version({ version: versionInformation?.newestVersion ?? m.common_unknown() })}+ {:else if updateType === 'digest'}+ New digest: {updateDisplayText}+ {:else}+ {m.common_unknown()}+ {/if}</span></div>{/snippet}@@ -124,7 +161,7 @@{#if !isCollapsed}<div- class="rounded-xl border border-blue-500/20 bg-gradient-to-br from-blue-500/10 to-blue-600/5 p-3 transition-all hover:scale-[1.02] hover:from-blue-500/15 hover:to-blue-600/10 hover:shadow-md"+ class="rounded-xl border border-blue-500/20 bg-linear-to-br from-blue-500/10 to-blue-600/5 p-3 transition-all hover:scale-[1.02] hover:from-blue-500/15 hover:to-blue-600/10 hover:shadow-md"><div class="flex flex-col gap-2"><a@@ -148,7 +185,7 @@<Tooltip.Trigger>{#snippet child({ props })}<div- class="flex h-8 w-8 items-center justify-center rounded-lg border border-blue-500/20 bg-gradient-to-br from-blue-500/10 to-blue-600/5 transition-all hover:scale-[1.02] hover:from-blue-500/15 hover:to-blue-600/10 hover:shadow-md"+ class="flex h-8 w-8 items-center justify-center rounded-lg border border-blue-500/20 bg-linear-to-br from-blue-500/10 to-blue-600/5 transition-all hover:scale-[1.02] hover:from-blue-500/15 hover:to-blue-600/10 hover:shadow-md"{...props}><adiff --git a/frontend/src/lib/services/version-service.ts b/frontend/src/lib/services/version-service.tsindex 1bc1b0a42..f4928eef3 100644--- a/frontend/src/lib/services/version-service.ts+++ b/frontend/src/lib/services/version-service.ts@@ -13,20 +13,26 @@ async function getVersionInformation(): Promise<AppVersionInformation> {});const data = res.data as {currentVersion?: string;+ currentTag?: string;+ currentDigest?: string;displayVersion?: string;revision?: string;isSemverVersion?: boolean;newestVersion?: string;+ newestDigest?: string;updateAvailable?: boolean;releaseUrl?: string;};return {currentVersion: data.currentVersion || getCurrentVersion(),+ currentTag: data.currentTag,+ currentDigest: data.currentDigest,displayVersion: data.displayVersion || data.currentVersion || getCurrentVersion(),revision: data.revision || 'unknown',isSemverVersion: data.isSemverVersion || false,newestVersion: data.newestVersion,+ newestDigest: data.newestDigest,updateAvailable: data.updateAvailable || false,releaseUrl: data.releaseUrl};diff --git a/frontend/src/lib/types/application-configuration.ts b/frontend/src/lib/types/application-configuration.tsindex 7fe29e97f..55b7aa57e 100644--- a/frontend/src/lib/types/application-configuration.ts+++ b/frontend/src/lib/types/application-configuration.ts@@ -1,9 +1,12 @@export interface AppVersionInformation {currentVersion: string;+ currentTag?: string;+ currentDigest?: string;displayVersion: string;revision: string;isSemverVersion: boolean;newestVersion?: string;+ newestDigest?: string;updateAvailable?: boolean;releaseUrl?: string;releaseNotes?: string;diff --git a/frontend/src/routes/+layout.ts b/frontend/src/routes/+layout.tsindex e5bb448d8..229c01312 100644--- a/frontend/src/routes/+layout.ts+++ b/frontend/src/routes/+layout.ts@@ -48,10 +48,13 @@ export const load = async () => {const info = await versionService.getVersionInformation();versionInformation = {currentVersion: info.currentVersion,+ currentTag: info.currentTag,+ currentDigest: info.currentDigest,displayVersion: info.displayVersion,revision: info.revision,isSemverVersion: info.isSemverVersion,newestVersion: info.newestVersion,+ newestDigest: info.newestDigest,updateAvailable: info.updateAvailable,releaseUrl: info.releaseUrl};diff --git a/scripts/build-docker.sh b/scripts/build-docker.shindex 1f91add2c..a9500b075 100755--- a/scripts/build-docker.sh+++ b/scripts/build-docker.sh@@ -21,7 +21,7 @@ echo " VERSION: ${VERSION}"echo " REVISION: ${REVISION}"echo ""-docker build "${PULL_ARGS[@]}" --rm \+depot build "${PULL_ARGS[@]}" --rm \-f 'docker/Dockerfile' \--build-arg VERSION="${VERSION}" \--build-arg REVISION="${REVISION}" \diff --git a/scripts/github/build-binaries.sh b/scripts/github/build-binaries.shindex d3fd13452..b5c3e7f7d 100755--- a/scripts/github/build-binaries.sh+++ b/scripts/github/build-binaries.sh@@ -9,8 +9,8 @@ VERSION=${VERSION:-$(sed 's/^\s*\|\s*$//g' ../.version)}REVISION=${REVISION:-$(cat ../.revision 2>/dev/null || git rev-parse --short HEAD 2>/dev/null || echo "unknown")}LDFLAGS="-w -s -buildid=${VERSION} \- -X github.com/ofkm/arcane-backend/internal/config.Version=${VERSION} \- -X github.com/ofkm/arcane-backend/internal/config.Revision=${REVISION}"+ -X github.com/getarcaneapp/arcane/backend/internal/config.Version=${VERSION} \+ -X github.com/getarcaneapp/arcane/backend/internal/config.Revision=${REVISION}"DOCKER_ONLY=falseAGENT_BUILD=falsediff --git a/sonar-project.properties b/sonar-project.propertiesdeleted file mode 100644index 38d4dbea0..000000000--- a/sonar-project.properties+++ /dev/null@@ -1,3 +0,0 @@-sonar.projectKey=getarcaneapp_arcane_7820b102-6a29-478b-b61e-cbe482139fb0-sonar.go.tests.reportPaths=test-report.out-sonar.go.coverage.reportPaths=coverage.out