Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: notifications on remote environments used incorrect urls (#1302)
Kyle Mendell5d9845194edd
diff --git a/backend/internal/api/ws_handler.go b/backend/internal/api/ws_handler.goindex af4e938f7..38ac4c819 100644--- a/backend/internal/api/ws_handler.go+++ b/backend/internal/api/ws_handler.go@@ -120,7 +120,7 @@ func NewWebSocketHandler(gpuMonitoringEnabled: cfg.GPUMonitoringEnabled,gpuType: cfg.GPUType,wsUpgrader: websocket.Upgrader{- CheckOrigin: httputil.ValidateWebSocketOrigin(cfg.AppUrl),+ CheckOrigin: httputil.ValidateWebSocketOrigin(cfg.GetAppURL()),ReadBufferSize: 32 * 1024,WriteBufferSize: 32 * 1024,EnableCompression: true,diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.goindex 859fc876b..7227c10c0 100644--- a/backend/internal/bootstrap/bootstrap.go+++ b/backend/internal/bootstrap/bootstrap.go@@ -100,7 +100,7 @@ func Bootstrap(ctx context.Context) error {func handleAgentBootstrapPairing(ctx context.Context, cfg *config.Config, httpClient *http.Client) error {slog.InfoContext(ctx, "Agent mode detected with token, attempting auto-pairing", "managerUrl", cfg.ManagerApiUrl)- pairURL := strings.TrimRight(cfg.ManagerApiUrl, "/") + "/api/environments/pair"+ pairURL := strings.TrimRight(cfg.GetManagerBaseURL(), "/") + "/api/environments/pair"reqCtx, cancel := context.WithTimeout(ctx, 30*time.Second)defer cancel()diff --git a/backend/internal/config/config.go b/backend/internal/config/config.goindex 3b46edfb6..5918b7177 100644--- a/backend/internal/config/config.go+++ b/backend/internal/config/config.go@@ -101,6 +101,35 @@ func (a AppEnvironment) IsTestEnvironment() bool {return a == AppEnvironmentTest}+// GetManagerBaseURL returns the base URL of the manager application.+// It strips any trailing slashes or /api suffix from MANAGER_API_URL.+func (c *Config) GetManagerBaseURL() string {+ if c.ManagerApiUrl == "" {+ return ""+ }+ managerURL := strings.TrimRight(c.ManagerApiUrl, "/")+ managerURL = strings.TrimSuffix(managerURL, "/api")+ return managerURL+}++// GetAppURL returns the effective application URL.+// If in agent mode and APP_URL is not explicitly set, it returns the manager's URL.+func (c *Config) GetAppURL() string {+ // If APP_URL is explicitly set to something other than the default, use it+ if os.Getenv("APP_URL") != "" {+ return c.AppUrl+ }++ // If in agent mode and we have a manager URL, use the manager URL+ if c.AgentMode {+ if managerBase := c.GetManagerBaseURL(); managerBase != "" {+ return managerBase+ }+ }++ return c.AppUrl+}+func getBoolEnvOrDefault(key string, defaultValue bool) bool {if v, ok := os.LookupEnv(key); ok && v != "" {v = trimQuotes(v)diff --git a/backend/internal/huma/handlers/environments.go b/backend/internal/huma/handlers/environments.goindex 7d77cbf6d..fce231713 100644--- a/backend/internal/huma/handlers/environments.go+++ b/backend/internal/huma/handlers/environments.go@@ -868,7 +868,7 @@ func (h *EnvironmentHandler) GetDeploymentSnippets(ctx context.Context, input *G}// Generate snippets with placeholder for API key- snippets, err := h.environmentService.GenerateDeploymentSnippets(ctx, env.ID, h.cfg.AppUrl, "<YOUR_API_KEY>")+ snippets, err := h.environmentService.GenerateDeploymentSnippets(ctx, env.ID, h.cfg.GetAppURL(), "<YOUR_API_KEY>")if err != nil {slog.ErrorContext(ctx, "Failed to generate deployment snippets", "environmentID", input.ID, "error", err.Error())return nil, huma.Error500InternalServerError("Failed to generate deployment snippets")diff --git a/backend/internal/middleware/cors_middleware.go b/backend/internal/middleware/cors_middleware.goindex c9d578157..9c428fa74 100644--- a/backend/internal/middleware/cors_middleware.go+++ b/backend/internal/middleware/cors_middleware.go@@ -56,15 +56,17 @@ func deriveAllowedOrigins(cfg *config.Config, custom []string) []string {}var origins []string- if cfg != nil && cfg.AppUrl != "" {- appURL := cfg.AppUrl- if !strings.HasPrefix(appURL, "http://") && !strings.HasPrefix(appURL, "https://") {- appURL = "https://" + appURL- }- if u, err := url.Parse(appURL); err == nil {- origins = append(origins, u.Scheme+"://"+u.Host)- } else {- slog.Warn("Failed to parse APP_URL for CORS origins", "url", cfg.AppUrl, "error", err)+ if cfg != nil {+ appURL := cfg.GetAppURL()+ if appURL != "" {+ if !strings.HasPrefix(appURL, "http://") && !strings.HasPrefix(appURL, "https://") {+ appURL = "https://" + appURL+ }+ if u, err := url.Parse(appURL); err == nil {+ origins = append(origins, u.Scheme+"://"+u.Host)+ } else {+ slog.Warn("Failed to parse APP_URL for CORS origins", "url", appURL, "error", err)+ }}}diff --git a/backend/internal/services/notification_service.go b/backend/internal/services/notification_service.goindex 949e7f789..389e8d712 100644--- a/backend/internal/services/notification_service.go+++ b/backend/internal/services/notification_service.go@@ -398,10 +398,11 @@ func (s *NotificationService) sendEmailNotification(ctx context.Context, imageRe}func (s *NotificationService) renderEmailTemplate(imageRef string, updateInfo *imageupdate.Response) (string, string, error) {- logoURL := s.config.AppUrl + logoURLPath+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPathdata := map[string]interface{}{"LogoURL": logoURL,- "AppURL": s.config.AppUrl,+ "AppURL": appURL,"Environment": "Local Docker","ImageRef": imageRef,"HasUpdate": updateInfo.HasUpdate,@@ -605,10 +606,11 @@ func (s *NotificationService) sendEmailContainerUpdateNotification(ctx context.C}func (s *NotificationService) renderContainerUpdateEmailTemplate(containerName, imageRef, oldDigest, newDigest string) (string, string, error) {- logoURL := s.config.AppUrl + logoURLPath+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPathdata := map[string]interface{}{"LogoURL": logoURL,- "AppURL": s.config.AppUrl,+ "AppURL": appURL,"Environment": "Local Docker","ContainerName": containerName,"ImageRef": imageRef,@@ -765,10 +767,11 @@ func (s *NotificationService) sendTestEmail(ctx context.Context, config models.J}func (s *NotificationService) renderTestEmailTemplate() (string, string, error) {- logoURL := s.config.AppUrl + logoURLPath+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPathdata := map[string]interface{}{"LogoURL": logoURL,- "AppURL": s.config.AppUrl,+ "AppURL": appURL,}htmlContent, err := resources.FS.ReadFile("email-templates/test_html.tmpl")@@ -1048,10 +1051,11 @@ func (s *NotificationService) renderBatchEmailTemplate(updates map[string]*imageimageList = append(imageList, imageRef)}- logoURL := s.config.AppUrl + logoURLPath+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPathdata := map[string]interface{}{"LogoURL": logoURL,- "AppURL": s.config.AppUrl,+ "AppURL": appURL,"UpdateCount": len(updates),"CheckTime": time.Now().Format(time.RFC1123),"ImageList": imageList,diff --git a/backend/internal/services/oidc_service.go b/backend/internal/services/oidc_service.goindex b004513ca..b2713c337 100644--- a/backend/internal/services/oidc_service.go+++ b/backend/internal/services/oidc_service.go@@ -195,7 +195,7 @@ func (s *OidcService) GenerateAuthURL(ctx context.Context, redirectTo string, orfunc (s *OidcService) GetOidcRedirectURL(origin string) string {baseUrl := originif baseUrl == "" {- baseUrl = strings.TrimSuffix(s.config.AppUrl, "/")+ baseUrl = strings.TrimSuffix(s.config.GetAppURL(), "/")}return baseUrl + "/auth/oidc/callback"}diff --git a/docker/examples/compose.agent.yaml b/docker/examples/compose.agent.yamlindex 04e6b9cb7..ff9d1cc66 100644--- a/docker/examples/compose.agent.yaml+++ b/docker/examples/compose.agent.yaml@@ -6,7 +6,8 @@ services:- "3553:3553"environment:- AGENT_MODE=true- - AGENT_BOOTSTRAP_TOKEN=xxxxxxxxxxxxxxxxxxxxxxxxx+ - AGENT_TOKEN=arc_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX+ - MANAGER_API_URL=http://10.1.1.4:3552volumes:- /var/run/docker.sock:/var/run/docker.sock- agent-data:/app/data