Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: use port number from agent address input in docker snippets (#3955)
Tinkrynite2c34ade39db5
diff --git a/backend/internal/environment/environment_snippets.go b/backend/internal/environment/environment_snippets.goindex 876d923a2..6cd41aefc 100644--- a/backend/internal/environment/environment_snippets.go+++ b/backend/internal/environment/environment_snippets.go@@ -1,13 +1,13 @@package environmentimport (- "github.com/getarcaneapp/arcane/backend/v2/internal/database"-"context""fmt""log/slog"+ "net/url""strings"+ "github.com/getarcaneapp/arcane/backend/v2/internal/database""github.com/getarcaneapp/arcane/backend/v2/internal/event""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge")@@ -38,11 +38,13 @@ type DeploymentSnippetMTLS struct {const (deploymentSnippetsDataPath = "/app/data"deploymentSnippetsMTLSPath = "/app/data/edge-mtls-agent"+ agentContainerPort = "3553")// GenerateDeploymentSnippets generates Docker deployment snippets for an environment.-func (s *EnvironmentService) GenerateDeploymentSnippets(ctx context.Context, envID string, envAddress string, apiKey string) (*DeploymentSnippets, error) {- managerURL := strings.TrimRight(envAddress, "/")+func (s *EnvironmentService) GenerateDeploymentSnippets(ctx context.Context, envID, managerURL, agentURL, apiKey string) (*DeploymentSnippets, error) {+ managerURL = strings.TrimRight(managerURL, "/")+ portMapping := fmt.Sprintf("%s:%s", agentHostPortInternal(agentURL), agentContainerPort)dockerRun := strings.Join([]string{"docker run -d \\",@@ -52,7 +54,7 @@ func (s *EnvironmentService) GenerateDeploymentSnippets(ctx context.Context, env" -e EDGE_TRANSPORT=poll \\",fmt.Sprintf(" -e AGENT_TOKEN=%s \\", apiKey),fmt.Sprintf(" -e MANAGER_API_URL=%s \\", managerURL),- " -p 3553:3553 \\",+ fmt.Sprintf(" -p %s \\", portMapping)," -v /var/run/docker.sock:/var/run/docker.sock \\",fmt.Sprintf(" -v arcane-data:%s \\", deploymentSnippetsDataPath)," ghcr.io/getarcaneapp/agent:latest",@@ -70,7 +72,7 @@ func (s *EnvironmentService) GenerateDeploymentSnippets(ctx context.Context, env" - AGENT_TOKEN=" + apiKey," - MANAGER_API_URL=" + managerURL," ports:",- " - \"3553:3553\"",+ fmt.Sprintf(" - %q", portMapping)," volumes:"," - /var/run/docker.sock:/var/run/docker.sock"," - arcane-data:" + deploymentSnippetsDataPath,@@ -244,3 +246,22 @@ func buildMTLSDeploymentSnippetInternal(managerURL string, apiKey string, generaHostDirHint: strings.TrimSpace(generatedAssets.HostDirHint),}}++func agentHostPortInternal(agentURL string) string {+ parsed, err := url.Parse(strings.TrimSpace(agentURL))+ if err != nil || parsed.Host == "" {+ return agentContainerPort+ }+ if port := parsed.Port(); port != "" {+ return port+ }++ switch strings.ToLower(parsed.Scheme) {+ case "https":+ return "443"+ case "http":+ return "80"+ default:+ return agentContainerPort+ }+}diff --git a/backend/internal/environment/handler.go b/backend/internal/environment/handler.goindex 2dbe287ad..cd9ba7bbe 100644--- a/backend/internal/environment/handler.go+++ b/backend/internal/environment/handler.go@@ -1055,7 +1055,7 @@ func (h *EnvironmentHandler) GetDeploymentSnippets(ctx context.Context, input *GAppURL: h.cfg.GetAppURL(),})} else {- snippets, err = h.environmentService.GenerateDeploymentSnippets(ctx, env.ID, h.cfg.GetAppURL(), *env.AccessToken)+ snippets, err = h.environmentService.GenerateDeploymentSnippets(ctx, env.ID, h.cfg.GetAppURL(), env.ApiUrl, *env.AccessToken)}if err != nil {slog.ErrorContext(ctx, "Failed to generate deployment snippets", "environmentID", input.ID, "error", err.Error())diff --git a/backend/internal/environment/service_test.go b/backend/internal/environment/service_test.goindex 3b511c34c..1f9e04f2c 100644--- a/backend/internal/environment/service_test.go+++ b/backend/internal/environment/service_test.go@@ -849,7 +849,7 @@ func TestEnvironmentService_ResolveEnvironmentByAccessToken(t *testing.T) {func TestEnvironmentService_GenerateDeploymentSnippets_ExplicitlyUsePollTransport(t *testing.T) {svc := NewEnvironmentService(nil, nil, nil, nil, nil, nil)- standard, err := svc.GenerateDeploymentSnippets(context.Background(), "env-1", "https://manager.example.com", "token-123")+ standard, err := svc.GenerateDeploymentSnippets(context.Background(), "env-1", "https://manager.example.com", "https://agent.example.com", "token-123")require.NoError(t, err)require.NotNil(t, standard)require.NotContains(t, standard.DockerRun, "EDGE_TRANSPORT=websocket")@@ -874,6 +874,63 @@ func TestEnvironmentService_GenerateDeploymentSnippets_ExplicitlyUsePollTransporrequire.NotContains(t, edgeSnippets.DockerRun, "-v arcane-data:/data")}+func TestEnvironmentService_GenerateDeploymentSnippets_PublishesAgentURLPort(t *testing.T) {+ t.Parallel()++ tests := []struct {+ name string+ agentURL string+ portMapping string+ }{+ {name: "default port", agentURL: "http://agent.example.com:3553", portMapping: "3553:3553"},+ {name: "custom port", agentURL: "http://agent.example.com:1234", portMapping: "1234:3553"},+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ t.Parallel()+ svc := NewEnvironmentService(nil, nil, nil, nil, nil, nil)++ snippets, err := svc.GenerateDeploymentSnippets(t.Context(), "env-1", "https://manager.example.com", tt.agentURL, "token-123")+ require.NoError(t, err)+ require.NotNil(t, snippets)+ require.Contains(t, snippets.DockerRun, " -p "+tt.portMapping+" \\")+ require.Contains(t, snippets.DockerCompose, fmt.Sprintf(" ports:\n - %q\n", tt.portMapping))+ require.Contains(t, snippets.DockerRun, "MANAGER_API_URL=https://manager.example.com")+ require.Contains(t, snippets.DockerCompose, "MANAGER_API_URL=https://manager.example.com")+ if tt.portMapping != "3553:3553" {+ require.NotContains(t, snippets.DockerRun, "-p 3553:3553")+ require.NotContains(t, snippets.DockerCompose, "3553:3553")+ }+ })+ }+}++func TestAgentHostPortInternal(t *testing.T) {+ t.Parallel()++ tests := []struct {+ name string+ url string+ want string+ }{+ {name: "explicit custom port", url: "http://agent.example.com:1234", want: "1234"},+ {name: "default agent port", url: "http://agent.example.com:3553", want: "3553"},+ {name: "http without port uses 80", url: "http://agent.example.com", want: "80"},+ {name: "https without port uses 443", url: "https://agent.example.com", want: "443"},+ {name: "ipv6 with port", url: "http://[2001:db8::1]:9999", want: "9999"},+ {name: "empty falls back to container port", url: "", want: "3553"},+ {name: "invalid falls back to container port", url: "not a url", want: "3553"},+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ t.Parallel()+ require.Equal(t, tt.want, agentHostPortInternal(tt.url))+ })+ }+}+func TestEnvironmentService_EnsureSwarmNodeAgentEnvironment_CreatesVisibleEnvironmentAndReusesToken(t *testing.T) {ctx := context.Background()db := setupEnvironmentServiceTestDB(t)diff --git a/backend/internal/swarm/handler.go b/backend/internal/swarm/handler.goindex cc40b9b22..2ab03036d 100644--- a/backend/internal/swarm/handler.go+++ b/backend/internal/swarm/handler.go@@ -691,7 +691,7 @@ func (h *SwarmHandler) GetNodeAgentDeployment(ctx context.Context, input *GetSwaAppURL: h.cfg.GetAppURL(),})} else {- snippets, err = h.environmentService.GenerateDeploymentSnippets(ctx, env.ID, h.cfg.GetAppURL(), apiKey)+ snippets, err = h.environmentService.GenerateDeploymentSnippets(ctx, env.ID, h.cfg.GetAppURL(), env.ApiUrl, apiKey)}if err != nil {return nil, huma.Error500InternalServerError(err.Error())diff --git a/frontend/messages/cs.json b/frontend/messages/cs.jsonindex 619b1b536..1a103a9ec 100644--- a/frontend/messages/cs.json+++ b/frontend/messages/cs.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Vygenerujte API klíč a úryvky kódu pro nasazení nového agenta.","environments_production_docker": "Produkční Docker","environments_agent_address": "Adresa agenta",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "URL adresa, na které bude váš agent dostupný","environments_generate_config": "Vygenerovat konfiguraci agenta","new_folder": "Nová složka",diff --git a/frontend/messages/da.json b/frontend/messages/da.jsonindex ce4bf7355..0b60f3540 100644--- a/frontend/messages/da.json+++ b/frontend/messages/da.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Generate an API key and deployment snippets for a new agent.","environments_production_docker": "Production Docker","environments_agent_address": "Agent Address",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "The URL where your agent will be accessible","environments_generate_config": "Generate Agent Configuration","new_folder": "Ny mappe",diff --git a/frontend/messages/de.json b/frontend/messages/de.jsonindex 0f871273c..8f7c93891 100644--- a/frontend/messages/de.json+++ b/frontend/messages/de.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Einen API-Key und Deployment-Snippets für einen neuen Agenten generieren.","environments_production_docker": "Produktionsdocker","environments_agent_address": "Agent-Adresse",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "Die URL, unter der dein Agent erreichbar sein wird","environments_generate_config": "Agent-Konfiguration generieren","new_folder": "Neuer Ordner",diff --git a/frontend/messages/el.json b/frontend/messages/el.jsonindex 46f02c10b..502af575a 100644--- a/frontend/messages/el.json+++ b/frontend/messages/el.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Δημιουργήστε ένα κλειδί API και αποσπάσματα ανάπτυξης για ένα νέο πράκτορα.","environments_production_docker": "Προσάρτηση Παραγωγής","environments_agent_address": "Διεύθυνση Παράγοντα",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "Το URL όπου ο πράκτορας σας θα είναι προσβάσιμος","environments_generate_config": "Δημιουργία Διαμόρφωσης Παράγοντα","new_folder": "Νέος φάκελος",diff --git a/frontend/messages/en.json b/frontend/messages/en.jsonindex 6a44d0b99..b0ae4d941 100644--- a/frontend/messages/en.json+++ b/frontend/messages/en.json@@ -2831,7 +2831,7 @@"environments_create_new_agent_description": "Generate an API key and deployment snippets for a new agent.","environments_production_docker": "Production Docker","environments_agent_address": "Agent Address",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "The URL where your agent will be accessible","environments_generate_config": "Generate Agent Configuration","new_folder": "New Folder",diff --git a/frontend/messages/eo.json b/frontend/messages/eo.jsonindex ab3f828eb..4d828cb56 100644--- a/frontend/messages/eo.json+++ b/frontend/messages/eo.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Kreu API-ŝlosilon kaj deplojajn fragmentojn por nova agento.","environments_production_docker": "Produktada Docker","environments_agent_address": "Adreso de la agento",- "environments_agent_address_placeholder": "agento.ekzemplo.com",+ "environments_agent_address_placeholder": "agento.ekzemplo.com:3553","environments_agent_address_description": "La URL, kie via agento estos alirebla","environments_generate_config": "Generi agentan konfiguron","new_folder": "Nova dosierujo",diff --git a/frontend/messages/es.json b/frontend/messages/es.jsonindex c0a41c0b0..6ec384664 100644--- a/frontend/messages/es.json+++ b/frontend/messages/es.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Generar una clave API y fragmentos de despliegue para un nuevo agente.","environments_production_docker": "Docker de Producción","environments_agent_address": "Dirección del agente",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "La URL a la que su agente será accesible","environments_generate_config": "Generar configuración del agente","new_folder": "Carpeta nueva",diff --git a/frontend/messages/fr.json b/frontend/messages/fr.jsonindex ddabb25a8..b1f9a9fc3 100644--- a/frontend/messages/fr.json+++ b/frontend/messages/fr.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Générer une clé API et des extraits de déploiement pour un nouvel agent.","environments_production_docker": "Docker de Production","environments_agent_address": "Adresse de l'agent",- "environments_agent_address_placeholder": "agent.exemple.com",+ "environments_agent_address_placeholder": "agent.exemple.com:3553","environments_agent_address_description": "L'URL où votre agent sera accessible","environments_generate_config": "Générer la configuration de l'agent","new_folder": "Nouveau dossier",diff --git a/frontend/messages/hu.json b/frontend/messages/hu.jsonindex 91ec531dd..a41c3519f 100644--- a/frontend/messages/hu.json+++ b/frontend/messages/hu.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Generate an API key and deployment snippets for a new agent.","environments_production_docker": "Production Docker","environments_agent_address": "Agent Address",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "The URL where your agent will be accessible","environments_generate_config": "Generate Agent Configuration","new_folder": "Új mappa",diff --git a/frontend/messages/it.json b/frontend/messages/it.jsonindex 7facbd4ea..91695c558 100644--- a/frontend/messages/it.json+++ b/frontend/messages/it.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Genera una chiave API e snippet di distribuzione per un nuovo agente.","environments_production_docker": "Docker Di Produzione","environments_agent_address": "Indirizzo Dell'Agente",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "L'URL dove il tuo agente sarà accessibile","environments_generate_config": "Genera Configurazione Agente","new_folder": "Nuova cartella",diff --git a/frontend/messages/ja.json b/frontend/messages/ja.jsonindex 3b3f652e0..bb7717e43 100644--- a/frontend/messages/ja.json+++ b/frontend/messages/ja.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Generate an API key and deployment snippets for a new agent.","environments_production_docker": "Production Docker","environments_agent_address": "Agent Address",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "The URL where your agent will be accessible","environments_generate_config": "Generate Agent Configuration","new_folder": "新しいフォルダ",diff --git a/frontend/messages/ko.json b/frontend/messages/ko.jsonindex 14a5518c9..82592d15b 100644--- a/frontend/messages/ko.json+++ b/frontend/messages/ko.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "새 에이전트에 사용할 API 키와 배포 스니펫을 생성합니다.","environments_production_docker": "프로덕션 Docker","environments_agent_address": "에이전트 주소",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "에이전트에 접근할 수 있는 URL입니다.","environments_generate_config": "에이전트 설정 생성","new_folder": "새 폴더",diff --git a/frontend/messages/nl.json b/frontend/messages/nl.jsonindex 0e25c45b3..32cf5e18a 100644--- a/frontend/messages/nl.json+++ b/frontend/messages/nl.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Genereer een API-sleutel en inzet snippets voor een nieuwe agent.","environments_production_docker": "Productie Docker","environments_agent_address": "Agent adres",- "environments_agent_address_placeholder": "agent.voorbeeld.com",+ "environments_agent_address_placeholder": "agent.voorbeeld.com:3553","environments_agent_address_description": "De URL waar uw agent toegankelijk is","environments_generate_config": "Genereer Agentconfiguratie","new_folder": "Nieuwe map",diff --git a/frontend/messages/pl.json b/frontend/messages/pl.jsonindex 1967809fd..ae8fddb24 100644--- a/frontend/messages/pl.json+++ b/frontend/messages/pl.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Generate an API key and deployment snippets for a new agent.","environments_production_docker": "Production Docker","environments_agent_address": "Agent Address",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "The URL where your agent will be accessible","environments_generate_config": "Generate Agent Configuration","new_folder": "Nowy folder",diff --git a/frontend/messages/pt-BR.json b/frontend/messages/pt-BR.jsonindex a546947da..1b2e77673 100644--- a/frontend/messages/pt-BR.json+++ b/frontend/messages/pt-BR.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Generate an API key and deployment snippets for a new agent.","environments_production_docker": "Docker de produção","environments_agent_address": "Endereço do agente",- "environments_agent_address_placeholder": "agente.exemplo.com",+ "environments_agent_address_placeholder": "agente.exemplo.com:3553","environments_agent_address_description": "O URL onde seu agente será acessível","environments_generate_config": "Generate Agent Configuration","new_folder": "Nova pasta",diff --git a/frontend/messages/ru.json b/frontend/messages/ru.jsonindex cf34e104d..ad93f8a8e 100644--- a/frontend/messages/ru.json+++ b/frontend/messages/ru.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Сгенерировать API-ключ и фрагменты развёртывания для нового агента.","environments_production_docker": "Docker для production","environments_agent_address": "Адрес агента",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "URL, по которому будет доступен ваш агент","environments_generate_config": "Сгенерировать конфигурацию агента","new_folder": "Новая папка",diff --git a/frontend/messages/sv.json b/frontend/messages/sv.jsonindex ba93ae569..7a2a18fce 100644--- a/frontend/messages/sv.json+++ b/frontend/messages/sv.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Generate an API key and deployment snippets for a new agent.","environments_production_docker": "Production Docker","environments_agent_address": "Agent Address",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "The URL where your agent will be accessible","environments_generate_config": "Generate Agent Configuration","new_folder": "Ny mapp",diff --git a/frontend/messages/tr.json b/frontend/messages/tr.jsonindex 4094f416e..5f6d3489b 100644--- a/frontend/messages/tr.json+++ b/frontend/messages/tr.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Yeni bir ajan için bir API anahtarı ve dağıtım kod parçacıkları oluşturun.","environments_production_docker": "Üretim Docker'ı","environments_agent_address": "Temsilci Adresi",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "Temsilcinize erişilebileceği URL","environments_generate_config": "Ajan Yapılandırmasını Oluştur","new_folder": "Yeni Klasör",diff --git a/frontend/messages/uk.json b/frontend/messages/uk.jsonindex 2af64e1f4..a40a2f789 100644--- a/frontend/messages/uk.json+++ b/frontend/messages/uk.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Generate an API key and deployment snippets for a new agent.","environments_production_docker": "Production Docker","environments_agent_address": "Agent Address",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "The URL where your agent will be accessible","environments_generate_config": "Generate Agent Configuration","new_folder": "Нова папка",diff --git a/frontend/messages/vi.json b/frontend/messages/vi.jsonindex 146e0d7cf..8dca82340 100644--- a/frontend/messages/vi.json+++ b/frontend/messages/vi.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "Tạo API Key và mã triển khai cho một Agent mới.","environments_production_docker": "Production Docker","environments_agent_address": "Địa chỉ Agent",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "URL nơi Agent của bạn có thể truy cập được","environments_generate_config": "Tạo cấu hình Agent","new_folder": "Thư mục mới",diff --git a/frontend/messages/zh-CN.json b/frontend/messages/zh-CN.jsonindex 3f0d28178..159f08a0c 100644--- a/frontend/messages/zh-CN.json+++ b/frontend/messages/zh-CN.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "为新代理生成一个 API 密钥和部署代码片段。","environments_production_docker": "生产停靠栏","environments_agent_address": "代理地址",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "您的代理人可以访问的 URL","environments_generate_config": "生成代理配置","new_folder": "新建文件夹",diff --git a/frontend/messages/zh-TW.json b/frontend/messages/zh-TW.jsonindex bd69e990a..00c1ce83d 100644--- a/frontend/messages/zh-TW.json+++ b/frontend/messages/zh-TW.json@@ -2829,7 +2829,7 @@"environments_create_new_agent_description": "建立一個 API 金鑰和以及部署程式片段來設定新的代理。","environments_production_docker": "正式環境 Docker","environments_agent_address": "代理網址",- "environments_agent_address_placeholder": "agent.example.com",+ "environments_agent_address_placeholder": "agent.example.com:3553","environments_agent_address_description": "存取代理的網址","environments_generate_config": "建立代理設定","new_folder": "新資料夾",