mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 07:41:27 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15b5b0e6e7 | ||
|
|
32b52d121f |
No files matched your search
@@ -23,6 +23,7 @@ import (
|
|||||||
|
|
||||||
dockercontainer "github.com/docker/docker/api/types/container"
|
dockercontainer "github.com/docker/docker/api/types/container"
|
||||||
"github.com/docker/docker/api/types/mount"
|
"github.com/docker/docker/api/types/mount"
|
||||||
|
"github.com/docker/docker/api/types/network"
|
||||||
"github.com/docker/docker/api/types/registry"
|
"github.com/docker/docker/api/types/registry"
|
||||||
"github.com/docker/go-connections/nat"
|
"github.com/docker/go-connections/nat"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -196,7 +197,7 @@ func (h *DatabaseHandler) GetDatabases(c *gin.Context) {
|
|||||||
db.Backups = DatabaseBackupConfig{Backups: []DatabaseBackup{}}
|
db.Backups = DatabaseBackupConfig{Backups: []DatabaseBackup{}}
|
||||||
}
|
}
|
||||||
db.Settings = h.generateMockSettings()
|
db.Settings = h.generateMockSettings()
|
||||||
db.ConnectionURL = h.resolveConnectionURL(db)
|
db.ConnectionURL = rewriteLoopbackURL(h.resolveConnectionURL(db), requestHostname(c))
|
||||||
} else {
|
} else {
|
||||||
db.Backups = DatabaseBackupConfig{Backups: []DatabaseBackup{}}
|
db.Backups = DatabaseBackupConfig{Backups: []DatabaseBackup{}}
|
||||||
db.ConnectionURL = ""
|
db.ConnectionURL = ""
|
||||||
@@ -235,7 +236,7 @@ func (h *DatabaseHandler) GetDatabase(c *gin.Context) {
|
|||||||
db.Backups = DatabaseBackupConfig{Backups: []DatabaseBackup{}}
|
db.Backups = DatabaseBackupConfig{Backups: []DatabaseBackup{}}
|
||||||
}
|
}
|
||||||
db.Settings = h.generateMockSettings()
|
db.Settings = h.generateMockSettings()
|
||||||
db.ConnectionURL = h.resolveConnectionURL(db)
|
db.ConnectionURL = rewriteLoopbackURL(h.resolveConnectionURL(db), requestHostname(c))
|
||||||
} else {
|
} else {
|
||||||
db.Backups = DatabaseBackupConfig{Backups: []DatabaseBackup{}}
|
db.Backups = DatabaseBackupConfig{Backups: []DatabaseBackup{}}
|
||||||
db.ConnectionURL = ""
|
db.ConnectionURL = ""
|
||||||
@@ -942,33 +943,47 @@ func (h *DatabaseHandler) generateMockSettings() DatabaseSettings {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// resolveConnectionURL returns the stored connection URL for privileged
|
||||||
|
// viewers, or "" when the runtime has not produced one (not provisioned yet).
|
||||||
func (h *DatabaseHandler) resolveConnectionURL(db DatabaseService) string {
|
func (h *DatabaseHandler) resolveConnectionURL(db DatabaseService) string {
|
||||||
if strings.TrimSpace(db.ConnectionURL) != "" {
|
return strings.TrimSpace(db.ConnectionURL)
|
||||||
return db.ConnectionURL
|
|
||||||
}
|
|
||||||
return h.generateConnectionURL(db)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *DatabaseHandler) generateConnectionURL(db DatabaseService) string {
|
// requestHostname returns the host the client used to reach the API, without
|
||||||
safeName := sanitizeDBIdentifier(db.Name, "app")
|
// the port. Empty when it cannot be determined.
|
||||||
switch db.Type {
|
func requestHostname(c *gin.Context) string {
|
||||||
case "postgresql":
|
host := strings.TrimSpace(c.Request.Host)
|
||||||
return fmt.Sprintf("postgresql://user:password@%s.containr.local:5432/%s", safeName, safeName)
|
if host == "" {
|
||||||
case "redis":
|
|
||||||
return fmt.Sprintf("redis://%s.containr.local:6379", safeName)
|
|
||||||
case "dragonfly":
|
|
||||||
return fmt.Sprintf("redis://%s.containr.local:6379", safeName)
|
|
||||||
case "mysql":
|
|
||||||
return fmt.Sprintf("mysql://user:password@%s.containr.local:3306/%s", safeName, safeName)
|
|
||||||
case "mariadb":
|
|
||||||
return fmt.Sprintf("mysql://user:password@%s.containr.local:3306/%s", safeName, safeName)
|
|
||||||
case "mongodb":
|
|
||||||
return fmt.Sprintf("mongodb://user:password@%s.containr.local:27017/%s", safeName, safeName)
|
|
||||||
case "clickhouse":
|
|
||||||
return fmt.Sprintf("http://%s.containr.local:8123", safeName)
|
|
||||||
default:
|
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
if h, _, err := net.SplitHostPort(host); err == nil {
|
||||||
|
return strings.Trim(h, "[]")
|
||||||
|
}
|
||||||
|
return strings.Trim(host, "[]")
|
||||||
|
}
|
||||||
|
|
||||||
|
// rewriteLoopbackURL swaps loopback/unspecified hosts in rawURL for the host
|
||||||
|
// the caller actually used, so URLs handed to remote browsers are usable.
|
||||||
|
func rewriteLoopbackURL(rawURL, host string) string {
|
||||||
|
if rawURL == "" || host == "" {
|
||||||
|
return rawURL
|
||||||
|
}
|
||||||
|
u, err := url.Parse(rawURL)
|
||||||
|
if err != nil {
|
||||||
|
return rawURL
|
||||||
|
}
|
||||||
|
switch strings.ToLower(u.Hostname()) {
|
||||||
|
case "localhost", "127.0.0.1", "0.0.0.0", "::1", "":
|
||||||
|
default:
|
||||||
|
return rawURL
|
||||||
|
}
|
||||||
|
port := u.Port()
|
||||||
|
if port == "" {
|
||||||
|
u.Host = host
|
||||||
|
} else {
|
||||||
|
u.Host = net.JoinHostPort(host, port)
|
||||||
|
}
|
||||||
|
return u.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *DatabaseHandler) reconcileManagedDatabaseState(ctx context.Context, db DatabaseService) DatabaseService {
|
func (h *DatabaseHandler) reconcileManagedDatabaseState(ctx context.Context, db DatabaseService) DatabaseService {
|
||||||
@@ -1223,13 +1238,13 @@ func (h *DatabaseHandler) provisionDatabaseWithVariables(databaseID, databaseNam
|
|||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
if h.dockerClient == nil {
|
if h.dockerClient == nil {
|
||||||
fallbackURL := h.generateConnectionURL(DatabaseService{Name: databaseName, Type: dbType})
|
_ = h.setDatabaseStatusAndConnection(databaseID, "running", sql.NullString{})
|
||||||
_ = h.setDatabaseStatusAndConnection(databaseID, "running", sql.NullString{String: fallbackURL, Valid: fallbackURL != ""})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
connectionURL, err := h.provisionDatabaseRuntime(ctx, databaseID, databaseName, dbType, runtimeVariables)
|
connectionURL, err := h.provisionDatabaseRuntime(ctx, databaseID, databaseName, dbType, runtimeVariables)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
log.Printf("containr: managed database %s (%s) provisioning failed: %v", databaseID, dbType, err)
|
||||||
_ = h.setDatabaseStatusAndConnection(databaseID, "error", sql.NullString{})
|
_ = h.setDatabaseStatusAndConnection(databaseID, "error", sql.NullString{})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -1337,7 +1352,7 @@ func (h *DatabaseHandler) provisionDatabaseRuntime(ctx context.Context, database
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
if err := waitForRuntimePortReadiness(ctx, hostPort); err != nil {
|
if err := h.waitForDatabaseReadiness(ctx, containerID, hostPort, plan.Port.Port()); err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1371,12 +1386,24 @@ func (h *DatabaseHandler) resolvePublishedHostPort(ctx context.Context, containe
|
|||||||
return "", fmt.Errorf("published host port not available")
|
return "", fmt.Errorf("published host port not available")
|
||||||
}
|
}
|
||||||
|
|
||||||
func waitForRuntimePortReadiness(ctx context.Context, hostPort string) error {
|
// waitForDatabaseReadiness probes the database's TCP port until it accepts a
|
||||||
addr := net.JoinHostPort("127.0.0.1", strings.TrimSpace(hostPort))
|
// connection. The published port lives on host loopback, which a containerized
|
||||||
deadline := time.Now().Add(30 * time.Second)
|
// backend cannot reach; in that case the database is additionally attached to
|
||||||
|
// the backend's own network and probed by container IP.
|
||||||
|
func (h *DatabaseHandler) waitForDatabaseReadiness(ctx context.Context, containerID, hostPort, containerPort string) error {
|
||||||
|
probeAddr := net.JoinHostPort("127.0.0.1", strings.TrimSpace(hostPort))
|
||||||
|
if backendNet := h.dockerClient.OwnNetworkName(ctx); backendNet != "" {
|
||||||
|
if err := h.dockerClient.ConnectNetwork(ctx, backendNet, containerID, network.EndpointSettings{}); err != nil {
|
||||||
|
log.Printf("containr: attach database %s to %s failed: %v", containerID, backendNet, err)
|
||||||
|
}
|
||||||
|
if ip := h.containerIPOnNetwork(ctx, containerID, backendNet); ip != "" {
|
||||||
|
probeAddr = net.JoinHostPort(ip, containerPort)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
deadline := time.Now().Add(30 * time.Second)
|
||||||
for time.Now().Before(deadline) {
|
for time.Now().Before(deadline) {
|
||||||
conn, err := net.DialTimeout("tcp", addr, 1500*time.Millisecond)
|
conn, err := net.DialTimeout("tcp", probeAddr, 1500*time.Millisecond)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
_ = conn.Close()
|
_ = conn.Close()
|
||||||
return nil
|
return nil
|
||||||
@@ -1389,7 +1416,18 @@ func waitForRuntimePortReadiness(ctx context.Context, hostPort string) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Errorf("database runtime did not become reachable on %s", addr)
|
return fmt.Errorf("database runtime did not become reachable on %s", probeAddr)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *DatabaseHandler) containerIPOnNetwork(ctx context.Context, containerID, networkName string) string {
|
||||||
|
inspect, err := h.dockerClient.GetContainer(ctx, containerID)
|
||||||
|
if err != nil || inspect.NetworkSettings == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
if ep, ok := inspect.NetworkSettings.Networks[networkName]; ok && ep != nil {
|
||||||
|
return strings.TrimSpace(ep.IPAddress)
|
||||||
|
}
|
||||||
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *DatabaseHandler) ensureImage(ctx context.Context, imageRef string) error {
|
func (h *DatabaseHandler) ensureImage(ctx context.Context, imageRef string) error {
|
||||||
|
|||||||
@@ -51,15 +51,16 @@ func TestDatabaseConnectionURLAndDefaultVersion(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range cases {
|
for _, tc := range cases {
|
||||||
url := handler.generateConnectionURL(DatabaseService{
|
plan, err := buildDatabaseRuntimePlan(tc.dbType, "example", nil)
|
||||||
Type: tc.dbType,
|
if err != nil {
|
||||||
Name: "example",
|
t.Fatalf("buildDatabaseRuntimePlan(%q) failed: %v", tc.dbType, err)
|
||||||
})
|
|
||||||
if url == "" {
|
|
||||||
t.Fatalf("generateConnectionURL returned empty for type %q", tc.dbType)
|
|
||||||
}
|
}
|
||||||
|
url := plan.ConnectionURL("15432")
|
||||||
if len(tc.urlContains) > 0 && !strings.HasPrefix(url, tc.urlContains) {
|
if len(tc.urlContains) > 0 && !strings.HasPrefix(url, tc.urlContains) {
|
||||||
t.Fatalf("generateConnectionURL(%q) = %q, expected prefix %q", tc.dbType, url, tc.urlContains)
|
t.Fatalf("ConnectionURL(%q) = %q, expected prefix %q", tc.dbType, url, tc.urlContains)
|
||||||
|
}
|
||||||
|
if !strings.Contains(url, ":15432") {
|
||||||
|
t.Fatalf("ConnectionURL(%q) = %q, expected published port", tc.dbType, url)
|
||||||
}
|
}
|
||||||
|
|
||||||
gotVersion := handler.getDefaultVersion(tc.dbType)
|
gotVersion := handler.getDefaultVersion(tc.dbType)
|
||||||
@@ -69,6 +70,17 @@ func TestDatabaseConnectionURLAndDefaultVersion(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestResolveConnectionURLNeverFabricates(t *testing.T) {
|
||||||
|
handler := &DatabaseHandler{}
|
||||||
|
|
||||||
|
if got := handler.resolveConnectionURL(DatabaseService{Type: "postgresql", Name: "example"}); got != "" {
|
||||||
|
t.Fatalf("resolveConnectionURL with no stored URL = %q, want empty", got)
|
||||||
|
}
|
||||||
|
if got := handler.resolveConnectionURL(DatabaseService{ConnectionURL: "postgresql://u:p@localhost:15432/db"}); got != "postgresql://u:p@localhost:15432/db" {
|
||||||
|
t.Fatalf("resolveConnectionURL = %q, want stored URL", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func TestBuildDatabaseRuntimePlanSupportsAllTypes(t *testing.T) {
|
func TestBuildDatabaseRuntimePlanSupportsAllTypes(t *testing.T) {
|
||||||
cases := []struct {
|
cases := []struct {
|
||||||
dbType string
|
dbType string
|
||||||
@@ -199,3 +211,23 @@ func TestHumanReadableBytes(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRewriteLoopbackURL(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name, raw, host, want string
|
||||||
|
}{
|
||||||
|
{"service url", "http://localhost:35981", "10.0.0.182", "http://10.0.0.182:35981"},
|
||||||
|
{"db url keeps creds", "postgresql://u:p@localhost:35432/db?sslmode=disable", "10.0.0.182", "postgresql://u:[email protected]:35432/db?sslmode=disable"},
|
||||||
|
{"ipv4 loopback", "redis://:[email protected]:36379/0", "host.lan", "redis://:[email protected]:36379/0"},
|
||||||
|
{"unspecified", "http://0.0.0.0:9000/x", "10.0.0.182", "http://10.0.0.182:9000/x"},
|
||||||
|
{"external host untouched", "https://example.com:443/x", "10.0.0.182", "https://example.com:443/x"},
|
||||||
|
{"empty raw", "", "10.0.0.182", ""},
|
||||||
|
{"empty host", "http://localhost:35981", "", "http://localhost:35981"},
|
||||||
|
{"no port", "http://localhost/path", "10.0.0.182", "http://10.0.0.182/path"},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
if got := rewriteLoopbackURL(tt.raw, tt.host); got != tt.want {
|
||||||
|
t.Errorf("%s: rewriteLoopbackURL(%q,%q) = %q, want %q", tt.name, tt.raw, tt.host, got, tt.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -356,6 +356,12 @@ func runDeploymentAndSyncWithImage(
|
|||||||
replicas = 1
|
replicas = 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var publishedPort int32
|
||||||
|
// Best effort: reuse the host port from the last live deployment so public
|
||||||
|
// URLs survive redeploys. Column exists post-migration; older DBs get
|
||||||
|
// ephemeral ports.
|
||||||
|
_ = db.QueryRow(`SELECT published_port FROM services WHERE id = $1`, service.ID).Scan(&publishedPort)
|
||||||
|
|
||||||
deployReq := &deployment.DeploymentRequest{
|
deployReq := &deployment.DeploymentRequest{
|
||||||
ProjectID: service.ProjectID.String(),
|
ProjectID: service.ProjectID.String(),
|
||||||
ServiceID: service.ID.String(),
|
ServiceID: service.ID.String(),
|
||||||
@@ -367,6 +373,7 @@ func runDeploymentAndSyncWithImage(
|
|||||||
Environment: env,
|
Environment: env,
|
||||||
Replicas: replicas,
|
Replicas: replicas,
|
||||||
PublicPort: int32(service.Port),
|
PublicPort: int32(service.Port),
|
||||||
|
PublishedPort: publishedPort,
|
||||||
Domain: service.Domain,
|
Domain: service.Domain,
|
||||||
HealthPath: service.HealthCheckPath,
|
HealthPath: service.HealthCheckPath,
|
||||||
RestartPolicy: service.RestartPolicy,
|
RestartPolicy: service.RestartPolicy,
|
||||||
|
|||||||
@@ -57,6 +57,33 @@ func SetupRoutes(router *gin.Engine, db *database.DB, redis *database.Redis, cfg
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
haManager := ha.NewHighAvailabilityManager(scheduler, metricsCollector)
|
haManager := ha.NewHighAvailabilityManager(scheduler, metricsCollector)
|
||||||
|
if db != nil && db.DB != nil {
|
||||||
|
haManager.WithPersistence(db.DB)
|
||||||
|
if err := haManager.LoadHealthChecks(context.Background()); err != nil {
|
||||||
|
log.Printf("Failed to restore health checks: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if dockerClient != nil && db != nil {
|
||||||
|
// Service-bound checks probe the service DNS name on the project
|
||||||
|
// network — the backend container joins it on demand. The old
|
||||||
|
// 127.0.0.1 fallback stays for node-bound checks.
|
||||||
|
docker := dockerClient
|
||||||
|
haManager.WithServiceResolver(func(ctx context.Context, serviceID string) (string, int, error) {
|
||||||
|
var name, projectID string
|
||||||
|
var port int
|
||||||
|
err := db.QueryRowContext(ctx,
|
||||||
|
`SELECT name, project_id::text, COALESCE(port, 0) FROM services WHERE id = $1`,
|
||||||
|
serviceID,
|
||||||
|
).Scan(&name, &projectID, &port)
|
||||||
|
if err != nil {
|
||||||
|
return "", 0, err
|
||||||
|
}
|
||||||
|
if err := docker.ConnectSelfToNetwork(ctx, deployment.ProjectNetworkName(projectID)); err != nil {
|
||||||
|
return "", 0, err
|
||||||
|
}
|
||||||
|
return name, port, nil
|
||||||
|
})
|
||||||
|
}
|
||||||
haAPIManager := NewHAManager(haManager)
|
haAPIManager := NewHAManager(haManager)
|
||||||
|
|
||||||
// Initialize scaling handler
|
// Initialize scaling handler
|
||||||
|
|||||||
@@ -36,6 +36,10 @@ func serviceRuntimeSpec(db *database.DB, service Service) (deployment.RuntimeSpe
|
|||||||
HealthPath: service.HealthCheckPath,
|
HealthPath: service.HealthCheckPath,
|
||||||
RestartPolicy: service.RestartPolicy,
|
RestartPolicy: service.RestartPolicy,
|
||||||
}
|
}
|
||||||
|
// Best effort: reuse the host port from the last live deployment so the
|
||||||
|
// public URL survives restarts. Column exists post-migration; older DBs
|
||||||
|
// silently get ephemeral ports.
|
||||||
|
_ = db.QueryRow(`SELECT published_port FROM services WHERE id = $1`, service.ID).Scan(&spec.PublishedPort)
|
||||||
if cmd := strings.TrimSpace(service.Command); cmd != "" {
|
if cmd := strings.TrimSpace(service.Command); cmd != "" {
|
||||||
spec.Command = strings.Fields(cmd)
|
spec.Command = strings.Fields(cmd)
|
||||||
}
|
}
|
||||||
@@ -283,6 +287,13 @@ func handleGetServiceRuntime(c *gin.Context) {
|
|||||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
engine.ProbeServiceHealth(c.Request.Context(), state, service.ProjectID.String(), service.Name, service.Port, service.HealthCheckPath)
|
||||||
|
persistPublishedPort(db, service.ID, state.Ports)
|
||||||
|
if host := requestHostname(c); host != "" {
|
||||||
|
for i, u := range state.URLs {
|
||||||
|
state.URLs[i] = rewriteLoopbackURL(u, host)
|
||||||
|
}
|
||||||
|
}
|
||||||
c.JSON(http.StatusOK, gin.H{"runtime": state})
|
c.JSON(http.StatusOK, gin.H{"runtime": state})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -302,6 +313,7 @@ func reconcileNow(c *gin.Context, engine *deployment.DeploymentEngine, db *datab
|
|||||||
status := "stopped"
|
status := "stopped"
|
||||||
if state != nil {
|
if state != nil {
|
||||||
status = state.Status
|
status = state.Status
|
||||||
|
persistPublishedPort(db, service.ID, state.Ports)
|
||||||
}
|
}
|
||||||
_, _ = db.Exec(`UPDATE services SET status = $1, updated_at = $2 WHERE id = $3`, status, time.Now(), service.ID)
|
_, _ = db.Exec(`UPDATE services SET status = $1, updated_at = $2 WHERE id = $3`, status, time.Now(), service.ID)
|
||||||
c.JSON(http.StatusOK, gin.H{"runtime": state})
|
c.JSON(http.StatusOK, gin.H{"runtime": state})
|
||||||
@@ -397,6 +409,18 @@ func handleServiceRedeploy(c *gin.Context) {
|
|||||||
reconcileNow(c, engine, db, service)
|
reconcileNow(c, engine, db, service)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// persistPublishedPort records the host port Docker actually bound so later
|
||||||
|
// redeploys can reuse it. Idempotent — only writes when the value changed.
|
||||||
|
func persistPublishedPort(db *database.DB, serviceID uuid.UUID, ports []uint16) {
|
||||||
|
if len(ports) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_, _ = db.Exec(
|
||||||
|
`UPDATE services SET published_port = $1 WHERE id = $2 AND published_port <> $1`,
|
||||||
|
int(ports[0]), serviceID,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
// liveServiceStatus reconciles the stored status with real container state.
|
// liveServiceStatus reconciles the stored status with real container state.
|
||||||
// No-op when Docker is unavailable — the stored status is returned as-is.
|
// No-op when Docker is unavailable — the stored status is returned as-is.
|
||||||
func liveServiceStatus(c *gin.Context, db *database.DB, service *Service) {
|
func liveServiceStatus(c *gin.Context, db *database.DB, service *Service) {
|
||||||
@@ -415,10 +439,11 @@ func liveServiceStatus(c *gin.Context, db *database.DB, service *Service) {
|
|||||||
service.Status = state.Status
|
service.Status = state.Status
|
||||||
_, _ = db.Exec(`UPDATE services SET status = $1, updated_at = $2 WHERE id = $3`, state.Status, time.Now(), service.ID)
|
_, _ = db.Exec(`UPDATE services SET status = $1, updated_at = $2 WHERE id = $3`, state.Status, time.Now(), service.ID)
|
||||||
}
|
}
|
||||||
|
persistPublishedPort(db, service.ID, state.Ports)
|
||||||
if service.Domain != "" {
|
if service.Domain != "" {
|
||||||
service.PublicURL = "https://" + service.Domain
|
service.PublicURL = "https://" + service.Domain
|
||||||
} else if len(state.URLs) > 0 {
|
} else if len(state.URLs) > 0 {
|
||||||
service.PublicURL = state.URLs[0]
|
service.PublicURL = rewriteLoopbackURL(state.URLs[0], requestHostname(c))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -475,9 +500,13 @@ func runtimeScaleService(c *gin.Context, serviceID string, replicas int) error {
|
|||||||
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
if _, err := engine.ReconcileService(ctx, spec); err != nil {
|
state, err := engine.ReconcileService(ctx, spec)
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if state != nil {
|
||||||
|
persistPublishedPort(db, service.ID, state.Ports)
|
||||||
|
}
|
||||||
_, _ = db.Exec(`UPDATE services SET replicas = $1, updated_at = $2 WHERE id = $3`, replicas, time.Now(), service.ID)
|
_, _ = db.Exec(`UPDATE services SET replicas = $1, updated_at = $2 WHERE id = $3`, replicas, time.Now(), service.ID)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -520,7 +520,9 @@ func handleUpdateService(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
_, _ = engine.ReconcileService(ctx, spec)
|
if state, err := engine.ReconcileService(ctx, spec); err == nil && state != nil {
|
||||||
|
persistPublishedPort(db.(*database.DB), serviceCopy.ID, state.Ports)
|
||||||
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,6 +40,9 @@ type hostMonitoringResponse struct {
|
|||||||
UptimeSeconds int64 `json:"uptime_seconds"`
|
UptimeSeconds int64 `json:"uptime_seconds"`
|
||||||
DockerAvailable bool `json:"docker_available"`
|
DockerAvailable bool `json:"docker_available"`
|
||||||
Docker map[string]any `json:"docker,omitempty"`
|
Docker map[string]any `json:"docker,omitempty"`
|
||||||
|
// Scope names what the telemetry actually measures: the physical host for
|
||||||
|
// native dockerd, or the Docker Desktop VM when the daemon runs in one.
|
||||||
|
Scope string `json:"scope"`
|
||||||
CollectedAt string `json:"collected_at"`
|
CollectedAt string `json:"collected_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,6 +162,7 @@ func handleGetHostMonitoring(c *gin.Context) {
|
|||||||
Storage: storage,
|
Storage: storage,
|
||||||
Load: load,
|
Load: load,
|
||||||
UptimeSeconds: uptime,
|
UptimeSeconds: uptime,
|
||||||
|
Scope: "host",
|
||||||
CollectedAt: time.Now().UTC().Format(time.RFC3339),
|
CollectedAt: time.Now().UTC().Format(time.RFC3339),
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,6 +177,10 @@ func handleGetHostMonitoring(c *gin.Context) {
|
|||||||
"images": info.Images,
|
"images": info.Images,
|
||||||
"driver": info.Driver,
|
"driver": info.Driver,
|
||||||
"server": info.ServerVersion,
|
"server": info.ServerVersion,
|
||||||
|
"os": info.OperatingSystem,
|
||||||
|
}
|
||||||
|
if strings.Contains(strings.ToLower(info.OperatingSystem), "docker desktop") {
|
||||||
|
response.Scope = "docker-desktop-vm"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -336,6 +336,16 @@ func handleCreateFromTemplate(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// sqlc's schema predates the runtime columns; port and healthcheck_path are
|
||||||
|
// written via raw SQL like every other service mutation path.
|
||||||
|
if _, err = tx.ExecContext(ctx,
|
||||||
|
`UPDATE services SET port = $1, healthcheck_path = $2 WHERE id = $3`,
|
||||||
|
config.Port, strings.TrimSpace(config.HealthCheck), serviceID,
|
||||||
|
); err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to create service from template"})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
for key, value := range envVars {
|
for key, value := range envVars {
|
||||||
if strings.TrimSpace(key) == "" {
|
if strings.TrimSpace(key) == "" {
|
||||||
continue
|
continue
|
||||||
@@ -731,7 +741,7 @@ func SeedTemplates() []ServiceTemplate {
|
|||||||
Name: "Background Worker",
|
Name: "Background Worker",
|
||||||
Description: "Background job processing service",
|
Description: "Background job processing service",
|
||||||
Category: "worker",
|
Category: "worker",
|
||||||
Logo: "https://cdn.simpleicons.org/terminal",
|
Logo: "https://cdn.simpleicons.org/gnubash",
|
||||||
Config: `{"type":"worker","runtime":"node","build_command":"npm install","start_command":"npm run worker"}`,
|
Config: `{"type":"worker","runtime":"node","build_command":"npm install","start_command":"npm run worker"}`,
|
||||||
Variables: `[{"key":"WORKER_CONCURRENCY","label":"Concurrency","default":"4","required":false,"secret":false}]`,
|
Variables: `[{"key":"WORKER_CONCURRENCY","label":"Concurrency","default":"4","required":false,"secret":false}]`,
|
||||||
IsOfficial: true,
|
IsOfficial: true,
|
||||||
@@ -741,7 +751,7 @@ func SeedTemplates() []ServiceTemplate {
|
|||||||
Name: "Cron Job",
|
Name: "Cron Job",
|
||||||
Description: "Scheduled task runner",
|
Description: "Scheduled task runner",
|
||||||
Category: "cron",
|
Category: "cron",
|
||||||
Logo: "https://cdn.simpleicons.org/clock",
|
Logo: "https://cdn.simpleicons.org/clockify",
|
||||||
Config: `{"type":"cron","runtime":"node","build_command":"npm install","start_command":"npm run cron"}`,
|
Config: `{"type":"cron","runtime":"node","build_command":"npm install","start_command":"npm run cron"}`,
|
||||||
Variables: `[{"key":"CRON_SCHEDULE","label":"Schedule","default":"0 * * * *","required":true,"secret":false}]`,
|
Variables: `[{"key":"CRON_SCHEDULE","label":"Schedule","default":"0 * * * *","required":true,"secret":false}]`,
|
||||||
IsOfficial: true,
|
IsOfficial: true,
|
||||||
|
|||||||
@@ -59,6 +59,9 @@ type ServiceConfig struct {
|
|||||||
Domain string `json:"domain,omitempty"`
|
Domain string `json:"domain,omitempty"`
|
||||||
// HealthPath is an HTTP path probed on PublicPort for container health.
|
// HealthPath is an HTTP path probed on PublicPort for container health.
|
||||||
HealthPath string `json:"health_path,omitempty"`
|
HealthPath string `json:"health_path,omitempty"`
|
||||||
|
// PublishedPort is the host port bound by the previous deployment; replica 0
|
||||||
|
// reuses it so public URLs survive restarts. 0 = pick ephemeral.
|
||||||
|
PublishedPort int32 `json:"published_port,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type PortMapping struct {
|
type PortMapping struct {
|
||||||
@@ -315,6 +318,7 @@ func (de *DeploymentEngine) deployService(ctx context.Context, deployment *Deplo
|
|||||||
Env: cfg.Environment,
|
Env: cfg.Environment,
|
||||||
Replicas: cfg.Replicas,
|
Replicas: cfg.Replicas,
|
||||||
Port: cfg.PublicPort,
|
Port: cfg.PublicPort,
|
||||||
|
PublishedPort: cfg.PublishedPort,
|
||||||
Domain: cfg.Domain,
|
Domain: cfg.Domain,
|
||||||
HealthPath: cfg.HealthPath,
|
HealthPath: cfg.HealthPath,
|
||||||
RestartPolicy: cfg.RestartPolicy,
|
RestartPolicy: cfg.RestartPolicy,
|
||||||
|
|||||||
@@ -5,8 +5,11 @@ import (
|
|||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/http"
|
||||||
"sort"
|
"sort"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -38,6 +41,7 @@ type RuntimeSpec struct {
|
|||||||
Env map[string]string // already resolved
|
Env map[string]string // already resolved
|
||||||
Replicas int
|
Replicas int
|
||||||
Port int32 // container port to expose publicly; 0 = none
|
Port int32 // container port to expose publicly; 0 = none
|
||||||
|
PublishedPort int32 // preferred host port for replica 0; 0 = pick ephemeral
|
||||||
Domain string // public hostname routed via Traefik; empty = none
|
Domain string // public hostname routed via Traefik; empty = none
|
||||||
HealthPath string // http path probed on Port for container healthcheck
|
HealthPath string // http path probed on Port for container healthcheck
|
||||||
RestartPolicy string
|
RestartPolicy string
|
||||||
@@ -58,10 +62,14 @@ type RuntimeState struct {
|
|||||||
Desired int `json:"desired"`
|
Desired int `json:"desired"`
|
||||||
Containers []RuntimeContainer `json:"containers"`
|
Containers []RuntimeContainer `json:"containers"`
|
||||||
URLs []string `json:"urls"`
|
URLs []string `json:"urls"`
|
||||||
|
Ports []uint16 `json:"ports"`
|
||||||
|
Health string `json:"health,omitempty"` // healthy, unhealthy, unreachable
|
||||||
Status string `json:"status"` // running, degraded, stopped
|
Status string `json:"status"` // running, degraded, stopped
|
||||||
}
|
}
|
||||||
|
|
||||||
func projectNetworkName(projectID string) string {
|
// ProjectNetworkName is the deterministic docker network every service in a
|
||||||
|
// project joins — containr-proj-<first 12 hex chars of the project uuid>.
|
||||||
|
func ProjectNetworkName(projectID string) string {
|
||||||
short := strings.ReplaceAll(projectID, "-", "")
|
short := strings.ReplaceAll(projectID, "-", "")
|
||||||
if len(short) > 12 {
|
if len(short) > 12 {
|
||||||
short = short[:12]
|
short = short[:12]
|
||||||
@@ -76,7 +84,7 @@ func serviceNamePrefix(serviceID string) string {
|
|||||||
// EnsureProjectNetwork creates the per-project bridge network if missing.
|
// EnsureProjectNetwork creates the per-project bridge network if missing.
|
||||||
// Containers on it resolve each other by service name (private networking).
|
// Containers on it resolve each other by service name (private networking).
|
||||||
func (de *DeploymentEngine) EnsureProjectNetwork(ctx context.Context, projectID string) (string, error) {
|
func (de *DeploymentEngine) EnsureProjectNetwork(ctx context.Context, projectID string) (string, error) {
|
||||||
name := projectNetworkName(projectID)
|
name := ProjectNetworkName(projectID)
|
||||||
|
|
||||||
networks, err := de.dockerClient.ListNetworks(ctx)
|
networks, err := de.dockerClient.ListNetworks(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -237,31 +245,70 @@ func (de *DeploymentEngine) createReplica(ctx context.Context, spec RuntimeSpec,
|
|||||||
Networks: endpoints,
|
Networks: endpoints,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var wantPort nat.Port
|
||||||
if spec.Port > 0 {
|
if spec.Port > 0 {
|
||||||
port := nat.Port(fmt.Sprintf("%d/tcp", spec.Port))
|
wantPort = nat.Port(fmt.Sprintf("%d/tcp", spec.Port))
|
||||||
cfg.ExposedPorts = nat.PortSet{port: struct{}{}}
|
cfg.ExposedPorts = nat.PortSet{wantPort: struct{}{}}
|
||||||
// Always publish an ephemeral host port for direct access; a configured
|
|
||||||
// domain is additionally routed via Traefik when the edge network exists.
|
|
||||||
cfg.PortBindings = nat.PortMap{port: []nat.PortBinding{{HostIP: "0.0.0.0", HostPort: ""}}}
|
|
||||||
if spec.HealthPath != "" {
|
|
||||||
cfg.Healthcheck = &container.HealthConfig{
|
|
||||||
Test: []string{"CMD-SHELL", fmt.Sprintf("wget -q -O /dev/null http://127.0.0.1:%d%s || exit 1", spec.Port, spec.HealthPath)},
|
|
||||||
Interval: 30 * time.Second,
|
|
||||||
Timeout: 5 * time.Second,
|
|
||||||
Retries: 3,
|
|
||||||
StartPeriod: 10 * time.Second,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// tryBind creates and starts a container publishing wantPort on hostPort
|
||||||
|
// ("" = ephemeral). A requested port is verified after start: Docker
|
||||||
|
// Desktop accepts a conflicting binding at create/start but publishes
|
||||||
|
// nothing, which would leave the service running with no endpoint.
|
||||||
|
tryBind := func(hostPort string) (string, error) {
|
||||||
|
if spec.Port > 0 {
|
||||||
|
cfg.PortBindings = nat.PortMap{wantPort: []nat.PortBinding{{HostIP: "0.0.0.0", HostPort: hostPort}}}
|
||||||
|
}
|
||||||
id, err := de.dockerClient.CreateContainer(ctx, cfg)
|
id, err := de.dockerClient.CreateContainer(ctx, cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
if err := de.dockerClient.StartContainer(ctx, id); err != nil {
|
if err := de.dockerClient.StartContainer(ctx, id); err != nil {
|
||||||
|
_ = de.dockerClient.RemoveContainer(ctx, id, true)
|
||||||
return "", fmt.Errorf("start: %w", err)
|
return "", fmt.Errorf("start: %w", err)
|
||||||
}
|
}
|
||||||
|
if hostPort != "" {
|
||||||
|
info, err := de.dockerClient.GetContainer(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
_ = de.dockerClient.RemoveContainer(ctx, id, true)
|
||||||
|
return "", fmt.Errorf("inspect: %w", err)
|
||||||
|
}
|
||||||
|
if info.NetworkSettings == nil || len(info.NetworkSettings.Ports[wantPort]) == 0 {
|
||||||
|
_ = de.dockerClient.RemoveContainer(ctx, id, true)
|
||||||
|
return "", errPortNotBound
|
||||||
|
}
|
||||||
|
}
|
||||||
return id, nil
|
return id, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
preferred := ""
|
||||||
|
if index == 0 && spec.PublishedPort > 0 {
|
||||||
|
preferred = strconv.Itoa(int(spec.PublishedPort))
|
||||||
|
}
|
||||||
|
id, err := tryBind(preferred)
|
||||||
|
if err != nil && preferred != "" && (isPortConflict(err) || errors.Is(err, errPortNotBound)) {
|
||||||
|
// Stored port got taken since last deploy — fall back to ephemeral; the
|
||||||
|
// new assignment is persisted on the next runtime read.
|
||||||
|
id, err = tryBind("")
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return id, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// errPortNotBound marks a container that started but failed to publish the
|
||||||
|
// requested host port (seen on Docker Desktop, which reports success while
|
||||||
|
// vpnkit drops a conflicting binding).
|
||||||
|
var errPortNotBound = errors.New("requested host port not bound")
|
||||||
|
|
||||||
|
// isPortConflict reports whether a container create failed because the
|
||||||
|
// requested host port was already bound.
|
||||||
|
func isPortConflict(err error) bool {
|
||||||
|
msg := strings.ToLower(err.Error())
|
||||||
|
return strings.Contains(msg, "port is already allocated") ||
|
||||||
|
strings.Contains(msg, "address already in use") ||
|
||||||
|
strings.Contains(msg, "cannot assign requested address")
|
||||||
}
|
}
|
||||||
|
|
||||||
// RuntimeState reads live container state for a service.
|
// RuntimeState reads live container state for a service.
|
||||||
@@ -282,6 +329,7 @@ func (de *DeploymentEngine) RuntimeState(ctx context.Context, serviceID string,
|
|||||||
for _, p := range c.Ports {
|
for _, p := range c.Ports {
|
||||||
if p.PublicPort != 0 {
|
if p.PublicPort != 0 {
|
||||||
state.URLs = append(state.URLs, fmt.Sprintf("http://localhost:%d", p.PublicPort))
|
state.URLs = append(state.URLs, fmt.Sprintf("http://localhost:%d", p.PublicPort))
|
||||||
|
state.Ports = append(state.Ports, p.PublicPort)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -299,6 +347,57 @@ func (de *DeploymentEngine) RuntimeState(ctx context.Context, serviceID string,
|
|||||||
return state, nil
|
return state, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ProbeServiceHealth performs an HTTP GET on healthPath and records the
|
||||||
|
// outcome on state.Health. When the backend runs containerized it first
|
||||||
|
// attaches to the service's project network and probes the service by DNS
|
||||||
|
// name — this works for every image (no shell or wget required inside the
|
||||||
|
// container) and checks the service itself, not the published edge. A
|
||||||
|
// host-run backend falls back to probing the published host port.
|
||||||
|
func (de *DeploymentEngine) ProbeServiceHealth(ctx context.Context, state *RuntimeState, projectID, serviceName string, port int, healthPath string) {
|
||||||
|
if state == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
state.Health = ""
|
||||||
|
if healthPath == "" || port <= 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !strings.HasPrefix(healthPath, "/") {
|
||||||
|
healthPath = "/" + healthPath
|
||||||
|
}
|
||||||
|
|
||||||
|
probeURL := ""
|
||||||
|
if networkName := ProjectNetworkName(projectID); networkName != "" {
|
||||||
|
if err := de.dockerClient.ConnectSelfToNetwork(ctx, networkName); err == nil {
|
||||||
|
probeURL = fmt.Sprintf("http://%s:%d%s", serviceName, port, healthPath)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if probeURL == "" && len(state.Ports) > 0 {
|
||||||
|
probeURL = fmt.Sprintf("http://%s:%d%s", de.dockerClient.HostProbeHost(ctx), state.Ports[0], healthPath)
|
||||||
|
}
|
||||||
|
if probeURL == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
reqCtx, cancel := context.WithTimeout(ctx, 3*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
req, err := http.NewRequestWithContext(reqCtx, http.MethodGet, probeURL, nil)
|
||||||
|
if err != nil {
|
||||||
|
state.Health = "unreachable"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
resp, err := http.DefaultClient.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
state.Health = "unreachable"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode >= 200 && resp.StatusCode < 400 {
|
||||||
|
state.Health = "healthy"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
state.Health = "unhealthy"
|
||||||
|
}
|
||||||
|
|
||||||
// StopService stops (but keeps) all replicas of a service.
|
// StopService stops (but keeps) all replicas of a service.
|
||||||
func (de *DeploymentEngine) StopService(ctx context.Context, serviceID string) error {
|
func (de *DeploymentEngine) StopService(ctx context.Context, serviceID string) error {
|
||||||
containers, err := de.ListServiceContainers(ctx, serviceID)
|
containers, err := de.ListServiceContainers(ctx, serviceID)
|
||||||
@@ -359,7 +458,7 @@ func (de *DeploymentEngine) RemoveProjectContainers(ctx context.Context, project
|
|||||||
|
|
||||||
// RemoveProjectNetwork removes the per-project bridge network if present.
|
// RemoveProjectNetwork removes the per-project bridge network if present.
|
||||||
func (de *DeploymentEngine) RemoveProjectNetwork(ctx context.Context, projectID string) error {
|
func (de *DeploymentEngine) RemoveProjectNetwork(ctx context.Context, projectID string) error {
|
||||||
return de.dockerClient.RemoveNetwork(ctx, projectNetworkName(projectID))
|
return de.dockerClient.RemoveNetwork(ctx, ProjectNetworkName(projectID))
|
||||||
}
|
}
|
||||||
|
|
||||||
func replicaIndex(c container.Summary) int {
|
func replicaIndex(c container.Summary) int {
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"os"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
@@ -24,6 +27,7 @@ import (
|
|||||||
// Client wraps the Docker client with additional functionality
|
// Client wraps the Docker client with additional functionality
|
||||||
type Client struct {
|
type Client struct {
|
||||||
cli *client.Client
|
cli *client.Client
|
||||||
|
probeHost string
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewClient creates a new Docker client
|
// NewClient creates a new Docker client
|
||||||
@@ -45,6 +49,75 @@ func NewClient() (*Client, error) {
|
|||||||
return &Client{cli: cli}, nil
|
return &Client{cli: cli}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HostProbeHost returns an address through which host-published container
|
||||||
|
// ports are reachable. When this process runs inside a container, host
|
||||||
|
// loopback is unreachable; the bridge gateway IP routes to ports published
|
||||||
|
// on 0.0.0.0. Result is cached for the process lifetime.
|
||||||
|
func (c *Client) HostProbeHost(ctx context.Context) string {
|
||||||
|
if c.probeHost != "" {
|
||||||
|
return c.probeHost
|
||||||
|
}
|
||||||
|
host := "127.0.0.1"
|
||||||
|
if self, err := c.self(ctx); err == nil && self.NetworkSettings != nil {
|
||||||
|
for _, n := range self.NetworkSettings.Networks {
|
||||||
|
if n != nil && n.Gateway != "" {
|
||||||
|
host = n.Gateway
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.probeHost = host
|
||||||
|
return host
|
||||||
|
}
|
||||||
|
|
||||||
|
// OwnNetworkName returns the name of the platform network this process's
|
||||||
|
// container is attached to, or "" when not running containerized. Per-project
|
||||||
|
// and default Docker networks are never selected; among remaining networks
|
||||||
|
// the lexicographically first wins so the choice is deterministic.
|
||||||
|
func (c *Client) OwnNetworkName(ctx context.Context) string {
|
||||||
|
self, err := c.self(ctx)
|
||||||
|
if err != nil || self.NetworkSettings == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
names := make([]string, 0, len(self.NetworkSettings.Networks))
|
||||||
|
for name := range self.NetworkSettings.Networks {
|
||||||
|
switch {
|
||||||
|
case name == "bridge" || name == "host" || name == "none":
|
||||||
|
case strings.HasPrefix(name, "containr-proj-"):
|
||||||
|
default:
|
||||||
|
names = append(names, name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Strings(names)
|
||||||
|
if len(names) == 0 {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return names[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
// self inspects the container this process runs in (hostname == container ID).
|
||||||
|
func (c *Client) self(ctx context.Context) (types.ContainerJSON, error) {
|
||||||
|
hostname, err := os.Hostname()
|
||||||
|
if err != nil || hostname == "" {
|
||||||
|
return types.ContainerJSON{}, fmt.Errorf("hostname unavailable")
|
||||||
|
}
|
||||||
|
return c.cli.ContainerInspect(ctx, hostname)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ConnectSelfToNetwork attaches this process's container to the given network.
|
||||||
|
// No-op when already attached or when not running containerized.
|
||||||
|
func (c *Client) ConnectSelfToNetwork(ctx context.Context, networkName string) error {
|
||||||
|
hostname, err := os.Hostname()
|
||||||
|
if err != nil || hostname == "" {
|
||||||
|
return fmt.Errorf("hostname unavailable")
|
||||||
|
}
|
||||||
|
err = c.cli.NetworkConnect(ctx, networkName, hostname, &network.EndpointSettings{})
|
||||||
|
if err != nil && strings.Contains(strings.ToLower(err.Error()), "already exists") {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// ListContainers returns all containers
|
// ListContainers returns all containers
|
||||||
func (c *Client) ListContainers(ctx context.Context, all bool) ([]types.Container, error) {
|
func (c *Client) ListContainers(ctx context.Context, all bool) ([]types.Container, error) {
|
||||||
return c.cli.ContainerList(ctx, container.ListOptions{
|
return c.cli.ContainerList(ctx, container.ListOptions{
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package ha
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"database/sql"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
@@ -80,6 +81,8 @@ type HealthChecker struct {
|
|||||||
results map[string]*HealthCheckResult
|
results map[string]*HealthCheckResult
|
||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
checkInterval time.Duration
|
checkInterval time.Duration
|
||||||
|
serviceResolver func(ctx context.Context, serviceID string) (host string, port int, err error)
|
||||||
|
db *sql.DB
|
||||||
}
|
}
|
||||||
|
|
||||||
// HealthCheck represents a health check configuration
|
// HealthCheck represents a health check configuration
|
||||||
@@ -596,7 +599,11 @@ func (hc *HealthChecker) performHealthChecks(ctx context.Context) error {
|
|||||||
result := hc.performHealthCheck(ctx, check)
|
result := hc.performHealthCheck(ctx, check)
|
||||||
hc.mu.Lock()
|
hc.mu.Lock()
|
||||||
hc.results[check.ID] = result
|
hc.results[check.ID] = result
|
||||||
|
check.Status = result.Status
|
||||||
|
check.LastCheck = result.Timestamp
|
||||||
hc.mu.Unlock()
|
hc.mu.Unlock()
|
||||||
|
// Persist last-known state so a restart resumes with honest history.
|
||||||
|
hc.persistCheck(check)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -617,12 +624,20 @@ func (hc *HealthChecker) performHealthCheck(ctx context.Context, check *HealthCh
|
|||||||
checkCtx, cancel := context.WithTimeout(ctx, timeout)
|
checkCtx, cancel := context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
var err error
|
host, port, err := hc.resolveTarget(ctx, check)
|
||||||
|
if err != nil {
|
||||||
|
result.Status = HealthStatusUnhealthy
|
||||||
|
result.Message = err.Error()
|
||||||
|
result.ErrorCode = "TARGET_UNRESOLVED"
|
||||||
|
result.Latency = time.Since(start)
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
switch check.Type {
|
switch check.Type {
|
||||||
case HealthCheckTypeHTTP:
|
case HealthCheckTypeHTTP:
|
||||||
err = hc.performHTTPCheck(checkCtx, check)
|
err = hc.performHTTPCheck(checkCtx, check, host, port)
|
||||||
case HealthCheckTypeTCP:
|
case HealthCheckTypeTCP:
|
||||||
err = hc.performTCPCheck(checkCtx, check)
|
err = hc.performTCPCheck(checkCtx, check, host, port)
|
||||||
case HealthCheckTypeCommand:
|
case HealthCheckTypeCommand:
|
||||||
err = hc.performCommandCheck(checkCtx, check)
|
err = hc.performCommandCheck(checkCtx, check)
|
||||||
default:
|
default:
|
||||||
@@ -642,13 +657,11 @@ func (hc *HealthChecker) performHealthCheck(ctx context.Context, check *HealthCh
|
|||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
func (hc *HealthChecker) performHTTPCheck(ctx context.Context, check *HealthCheck) error {
|
func (hc *HealthChecker) performHTTPCheck(ctx context.Context, check *HealthCheck, host string, port int) error {
|
||||||
host := hc.resolveHealthCheckHost(check)
|
|
||||||
protocol := strings.ToLower(strings.TrimSpace(check.Config.Protocol))
|
protocol := strings.ToLower(strings.TrimSpace(check.Config.Protocol))
|
||||||
if protocol == "" {
|
if protocol == "" {
|
||||||
protocol = "http"
|
protocol = "http"
|
||||||
}
|
}
|
||||||
port := check.Config.Port
|
|
||||||
if port <= 0 {
|
if port <= 0 {
|
||||||
if protocol == "https" {
|
if protocol == "https" {
|
||||||
port = 443
|
port = 443
|
||||||
@@ -684,9 +697,7 @@ func (hc *HealthChecker) performHTTPCheck(ctx context.Context, check *HealthChec
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (hc *HealthChecker) performTCPCheck(ctx context.Context, check *HealthCheck) error {
|
func (hc *HealthChecker) performTCPCheck(ctx context.Context, check *HealthCheck, host string, port int) error {
|
||||||
host := hc.resolveHealthCheckHost(check)
|
|
||||||
port := check.Config.Port
|
|
||||||
if port <= 0 {
|
if port <= 0 {
|
||||||
port = 80
|
port = 80
|
||||||
}
|
}
|
||||||
@@ -723,6 +734,27 @@ func (hc *HealthChecker) performCommandCheck(ctx context.Context, check *HealthC
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithServiceResolver lets the API layer plug in service-aware targeting: a
|
||||||
|
// ServiceID-bound check resolves to the service's DNS name on its project
|
||||||
|
// network instead of the backend container's loopback, where dialing
|
||||||
|
// 127.0.0.1:<host port> can never succeed.
|
||||||
|
func (m *HighAvailabilityManager) WithServiceResolver(fn func(ctx context.Context, serviceID string) (host string, port int, err error)) *HighAvailabilityManager {
|
||||||
|
m.healthChecker.serviceResolver = fn
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
// WithPersistence attaches Postgres so configured checks survive restarts.
|
||||||
|
// Call LoadHealthChecks once during startup to hydrate state.
|
||||||
|
func (m *HighAvailabilityManager) WithPersistence(db *sql.DB) *HighAvailabilityManager {
|
||||||
|
m.healthChecker.db = db
|
||||||
|
return m
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadHealthChecks hydrates persisted health checks during startup.
|
||||||
|
func (m *HighAvailabilityManager) LoadHealthChecks(ctx context.Context) error {
|
||||||
|
return m.healthChecker.LoadHealthChecks(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
func (hc *HealthChecker) resolveHealthCheckHost(check *HealthCheck) string {
|
func (hc *HealthChecker) resolveHealthCheckHost(check *HealthCheck) string {
|
||||||
if strings.TrimSpace(check.NodeID) != "" && hc.scheduler != nil {
|
if strings.TrimSpace(check.NodeID) != "" && hc.scheduler != nil {
|
||||||
nodes := hc.scheduler.GetNodes()
|
nodes := hc.scheduler.GetNodes()
|
||||||
@@ -739,19 +771,109 @@ func (hc *HealthChecker) resolveHealthCheckHost(check *HealthCheck) string {
|
|||||||
return "127.0.0.1"
|
return "127.0.0.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// resolveTarget picks the dial target for a check: service-bound checks go to
|
||||||
|
// the service DNS name on the project network; node-bound and free-standing
|
||||||
|
// checks keep the old host behavior. A service-bound resolver failure is
|
||||||
|
// surfaced as an error — falling back to loopback would only produce a
|
||||||
|
// misleading "service down" result.
|
||||||
|
func (hc *HealthChecker) resolveTarget(ctx context.Context, check *HealthCheck) (string, int, error) {
|
||||||
|
port := check.Config.Port
|
||||||
|
if strings.TrimSpace(check.NodeID) == "" && check.ServiceID != "" && hc.serviceResolver != nil {
|
||||||
|
resolveCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
h, p, err := hc.serviceResolver(resolveCtx, check.ServiceID)
|
||||||
|
if err != nil {
|
||||||
|
return "", 0, fmt.Errorf("resolve service target: %w", err)
|
||||||
|
}
|
||||||
|
if h == "" {
|
||||||
|
return "", 0, fmt.Errorf("resolve service target: service %s not found", check.ServiceID)
|
||||||
|
}
|
||||||
|
if port <= 0 {
|
||||||
|
port = p
|
||||||
|
}
|
||||||
|
return h, port, nil
|
||||||
|
}
|
||||||
|
return hc.resolveHealthCheckHost(check), port, nil
|
||||||
|
}
|
||||||
|
|
||||||
// AddHealthCheck adds a new health check
|
// AddHealthCheck adds a new health check
|
||||||
func (hc *HealthChecker) AddHealthCheck(check *HealthCheck) {
|
func (hc *HealthChecker) AddHealthCheck(check *HealthCheck) {
|
||||||
hc.mu.Lock()
|
hc.mu.Lock()
|
||||||
defer hc.mu.Unlock()
|
|
||||||
hc.checks[check.ID] = check
|
hc.checks[check.ID] = check
|
||||||
|
hc.mu.Unlock()
|
||||||
|
hc.persistCheck(check)
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemoveHealthCheck removes a health check
|
// RemoveHealthCheck removes a health check
|
||||||
func (hc *HealthChecker) RemoveHealthCheck(checkID string) {
|
func (hc *HealthChecker) RemoveHealthCheck(checkID string) {
|
||||||
hc.mu.Lock()
|
hc.mu.Lock()
|
||||||
defer hc.mu.Unlock()
|
|
||||||
delete(hc.checks, checkID)
|
delete(hc.checks, checkID)
|
||||||
delete(hc.results, checkID)
|
delete(hc.results, checkID)
|
||||||
|
hc.mu.Unlock()
|
||||||
|
if hc.db != nil {
|
||||||
|
_, _ = hc.db.ExecContext(context.Background(), `DELETE FROM ha_health_checks WHERE id = $1`, checkID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// persistCheck upserts one check. Best effort — a write failure never blocks
|
||||||
|
// the in-memory path, matching the scaling-policy persistence style.
|
||||||
|
func (hc *HealthChecker) persistCheck(check *HealthCheck) {
|
||||||
|
if hc.db == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cfg, _ := json.Marshal(check.Config)
|
||||||
|
var lastCheck interface{}
|
||||||
|
if !check.LastCheck.IsZero() {
|
||||||
|
lastCheck = check.LastCheck
|
||||||
|
}
|
||||||
|
_, _ = hc.db.ExecContext(context.Background(),
|
||||||
|
`INSERT INTO ha_health_checks (id, service_id, node_id, type, config, status, last_check, updated_at)
|
||||||
|
VALUES ($1, $2, $3, $4, $5, $6, $7, now())
|
||||||
|
ON CONFLICT (id) DO UPDATE
|
||||||
|
SET service_id = EXCLUDED.service_id, node_id = EXCLUDED.node_id,
|
||||||
|
type = EXCLUDED.type, config = EXCLUDED.config,
|
||||||
|
status = EXCLUDED.status, last_check = EXCLUDED.last_check,
|
||||||
|
updated_at = now()`,
|
||||||
|
check.ID, check.ServiceID, check.NodeID, string(check.Type), cfg, string(check.Status), lastCheck,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadHealthChecks hydrates checks persisted across restarts.
|
||||||
|
func (hc *HealthChecker) LoadHealthChecks(ctx context.Context) error {
|
||||||
|
if hc.db == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
rows, err := hc.db.QueryContext(ctx,
|
||||||
|
`SELECT id, service_id, node_id, type, config, status, last_check FROM ha_health_checks`)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
loaded := 0
|
||||||
|
for rows.Next() {
|
||||||
|
var check HealthCheck
|
||||||
|
var cfg []byte
|
||||||
|
var status, checkType string
|
||||||
|
var lastCheck sql.NullTime
|
||||||
|
if err := rows.Scan(&check.ID, &check.ServiceID, &check.NodeID, &checkType, &cfg, &status, &lastCheck); err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
check.Type = HealthCheckType(checkType)
|
||||||
|
check.Status = HealthStatus(status)
|
||||||
|
if lastCheck.Valid {
|
||||||
|
check.LastCheck = lastCheck.Time
|
||||||
|
}
|
||||||
|
_ = json.Unmarshal(cfg, &check.Config)
|
||||||
|
hc.mu.Lock()
|
||||||
|
hc.checks[check.ID] = &check
|
||||||
|
hc.mu.Unlock()
|
||||||
|
loaded++
|
||||||
|
}
|
||||||
|
if loaded > 0 {
|
||||||
|
log.Printf("Restored %d health checks", loaded)
|
||||||
|
}
|
||||||
|
return rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetHealthCheck returns one configured health check.
|
// GetHealthCheck returns one configured health check.
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
-- +goose Up
|
||||||
|
-- Stable public host port for service replica 0. 0 means "not yet assigned";
|
||||||
|
-- the runtime writes the ephemeral port it picked back here so restarts and
|
||||||
|
-- redeploys keep the same public endpoint instead of churning.
|
||||||
|
ALTER TABLE public.services ADD COLUMN IF NOT EXISTS published_port integer NOT NULL DEFAULT 0;
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
ALTER TABLE public.services DROP COLUMN IF EXISTS published_port;
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
-- +goose Up
|
||||||
|
-- Persisted HA health checks. Previously checks lived only in memory, so a
|
||||||
|
-- backend restart silently deleted every configured check while services kept
|
||||||
|
-- running unmonitored.
|
||||||
|
CREATE TABLE IF NOT EXISTS ha_health_checks (
|
||||||
|
id uuid PRIMARY KEY,
|
||||||
|
service_id uuid NOT NULL REFERENCES services(id) ON DELETE CASCADE,
|
||||||
|
node_id varchar(255) NOT NULL DEFAULT '',
|
||||||
|
type varchar(20) NOT NULL,
|
||||||
|
config jsonb NOT NULL DEFAULT '{}'::jsonb,
|
||||||
|
status varchar(20) NOT NULL DEFAULT 'unknown',
|
||||||
|
last_check timestamptz,
|
||||||
|
created_at timestamptz NOT NULL DEFAULT now(),
|
||||||
|
updated_at timestamptz NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
-- +goose Down
|
||||||
|
DROP TABLE IF EXISTS ha_health_checks;
|
||||||
@@ -52,7 +52,13 @@ CREATE TABLE services (
|
|||||||
git_branch VARCHAR(100),
|
git_branch VARCHAR(100),
|
||||||
build_path VARCHAR(500),
|
build_path VARCHAR(500),
|
||||||
cpu VARCHAR(50),
|
cpu VARCHAR(50),
|
||||||
memory VARCHAR(50)
|
memory VARCHAR(50),
|
||||||
|
replicas INTEGER NOT NULL DEFAULT 1,
|
||||||
|
port INTEGER NOT NULL DEFAULT 0,
|
||||||
|
domain VARCHAR(255) NOT NULL DEFAULT '',
|
||||||
|
healthcheck_path VARCHAR(255) NOT NULL DEFAULT '',
|
||||||
|
restart_policy VARCHAR(50) NOT NULL DEFAULT 'unless-stopped',
|
||||||
|
published_port INTEGER NOT NULL DEFAULT 0
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE deployments (
|
CREATE TABLE deployments (
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Link, Navigate, Outlet, Route, Routes, useLocation } from 'react-router-dom';
|
import { Link, Navigate, Outlet, Route, Routes, useLocation } from 'react-router-dom';
|
||||||
import { useQuery } from '@tanstack/react-query';
|
import { useQuery } from '@tanstack/react-query';
|
||||||
import { ShieldCheck } from 'lucide-react';
|
import { Compass, ShieldCheck } from 'lucide-react';
|
||||||
import { PlatformShell } from './layout/PlatformShell';
|
import { PlatformShell } from './layout/PlatformShell';
|
||||||
import { ProjectsPage } from '@/features/projects/pages/ProjectsPage';
|
import { ProjectsPage } from '@/features/projects/pages/ProjectsPage';
|
||||||
import { ProjectWorkspacePage } from '@/features/workspace/pages/ProjectWorkspacePage';
|
import { ProjectWorkspacePage } from '@/features/workspace/pages/ProjectWorkspacePage';
|
||||||
@@ -103,6 +103,26 @@ function AdminRequired() {
|
|||||||
return <Outlet />;
|
return <Outlet />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function NotFoundPage() {
|
||||||
|
return (
|
||||||
|
<div className="flex min-h-[60vh] flex-col items-center justify-center gap-4 px-6 text-center">
|
||||||
|
<Compass size={32} className="text-[var(--text-tertiary)]" />
|
||||||
|
<div>
|
||||||
|
<h1 className="text-lg font-semibold text-[var(--text-primary)]">Page not found</h1>
|
||||||
|
<p className="mt-1 max-w-sm text-sm text-[var(--text-secondary)]">
|
||||||
|
The page you are looking for does not exist or was moved.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Link
|
||||||
|
to="/"
|
||||||
|
className="rounded-[var(--radius-md)] border border-[var(--border-default)] px-4 py-2 text-sm text-[var(--text-secondary)] hover:text-[var(--text-primary)]"
|
||||||
|
>
|
||||||
|
Back to home
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
return (
|
return (
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
@@ -138,14 +158,14 @@ export default function App() {
|
|||||||
<Route element={<AdminRequired />}>
|
<Route element={<AdminRequired />}>
|
||||||
<Route path="/admin" element={<AdminPage />} />
|
<Route path="/admin" element={<AdminPage />} />
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
|
<Route path="*" element={<NotFoundPage />} />
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
{/* Full-bleed design demo — renders its own chrome, no app shell */}
|
{/* Full-bleed design demo — renders its own chrome, no app shell */}
|
||||||
<Route element={<AuthRequired />}>
|
<Route element={<AuthRequired />}>
|
||||||
<Route path="/metrics-demo" element={<ServiceMetricsDashboard />} />
|
<Route path="/metrics-demo" element={<ServiceMetricsDashboard />} />
|
||||||
</Route>
|
</Route>
|
||||||
|
|
||||||
<Route path="*" element={<Navigate to="/" replace />} />
|
|
||||||
</Routes>
|
</Routes>
|
||||||
</ErrorBoundary>
|
</ErrorBoundary>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -25,10 +25,10 @@ const demoDeploys = [
|
|||||||
{ id: 'd4', name: 'Marketing Site', project: 'Growth Surface', status: 'DEPLOYED', when: '2h' },
|
{ id: 'd4', name: 'Marketing Site', project: 'Growth Surface', status: 'DEPLOYED', when: '2h' },
|
||||||
];
|
];
|
||||||
|
|
||||||
function getHealthStatus(stats: ProjectStats): 'healthy' | 'degraded' | 'critical' {
|
function getHealthStatus(stats: ProjectStats): 'healthy' | 'idle' | 'degraded' | 'critical' {
|
||||||
if (stats.service_count === 0) return 'healthy';
|
if (stats.service_count === 0) return 'idle';
|
||||||
if (stats.running_services === stats.service_count) return 'healthy';
|
if (stats.running_services === stats.service_count) return 'healthy';
|
||||||
if (stats.running_services >= stats.service_count / 2) return 'degraded';
|
if (stats.running_services > 0) return 'degraded';
|
||||||
return 'critical';
|
return 'critical';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,6 +36,8 @@ function healthBadge(health: ReturnType<typeof getHealthStatus>) {
|
|||||||
switch (health) {
|
switch (health) {
|
||||||
case 'healthy':
|
case 'healthy':
|
||||||
return { label: 'RUNNING', cls: 'v-st-ok' };
|
return { label: 'RUNNING', cls: 'v-st-ok' };
|
||||||
|
case 'idle':
|
||||||
|
return { label: 'IDLE', cls: '' };
|
||||||
case 'degraded':
|
case 'degraded':
|
||||||
return { label: 'DEGRADED', cls: 'v-st-warn' };
|
return { label: 'DEGRADED', cls: 'v-st-warn' };
|
||||||
case 'critical':
|
case 'critical':
|
||||||
@@ -70,7 +72,6 @@ function MiniCanvas({ project }: { project: ProjectEntity }) {
|
|||||||
{Array.from({ length: shown }).map((_, i) => (
|
{Array.from({ length: shown }).map((_, i) => (
|
||||||
<div key={i} className="v-node" style={positions[i]}>
|
<div key={i} className="v-node" style={positions[i]}>
|
||||||
<b className={`v-nd ${i < running ? '' : 'r'}`} />
|
<b className={`v-nd ${i < running ? '' : 'r'}`} />
|
||||||
svc{i + 1}
|
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
{extra > 0 ? (
|
{extra > 0 ? (
|
||||||
@@ -85,6 +86,7 @@ function ProjectCard({ project, href }: { project: ProjectEntity; href: string }
|
|||||||
const health = getHealthStatus(project.stats);
|
const health = getHealthStatus(project.stats);
|
||||||
const badge = healthBadge(health);
|
const badge = healthBadge(health);
|
||||||
const envOk = health === 'healthy';
|
const envOk = health === 'healthy';
|
||||||
|
const envLabel = envOk ? 'production' : health === 'idle' ? 'idle' : health === 'critical' ? 'down' : 'degraded';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<article
|
<article
|
||||||
@@ -101,10 +103,10 @@ function ProjectCard({ project, href }: { project: ProjectEntity; href: string }
|
|||||||
<div className="v-mono mt-3 flex items-center gap-2 text-[10.5px] text-[var(--text-tertiary)]">
|
<div className="v-mono mt-3 flex items-center gap-2 text-[10.5px] text-[var(--text-tertiary)]">
|
||||||
<i
|
<i
|
||||||
className="inline-block h-1.5 w-1.5 rounded-full"
|
className="inline-block h-1.5 w-1.5 rounded-full"
|
||||||
style={{ background: envOk ? 'var(--success)' : 'var(--warning)' }}
|
style={{ background: envOk ? 'var(--success)' : health === 'idle' ? 'var(--text-tertiary)' : health === 'critical' ? 'var(--error)' : 'var(--warning)' }}
|
||||||
/>
|
/>
|
||||||
<span className="text-[var(--text-secondary)]">
|
<span className="text-[var(--text-secondary)]">
|
||||||
{envOk ? 'production' : 'degraded'}
|
{envLabel}
|
||||||
</span>
|
</span>
|
||||||
<span>·</span>
|
<span>·</span>
|
||||||
<span>
|
<span>
|
||||||
@@ -179,6 +181,7 @@ export function ProjectsPage() {
|
|||||||
const totalServices = projects.reduce((sum, p) => sum + p.stats.service_count, 0);
|
const totalServices = projects.reduce((sum, p) => sum + p.stats.service_count, 0);
|
||||||
const runningServices = projects.reduce((sum, p) => sum + p.stats.running_services, 0);
|
const runningServices = projects.reduce((sum, p) => sum + p.stats.running_services, 0);
|
||||||
const host = hostQuery.data;
|
const host = hostQuery.data;
|
||||||
|
const hostLabel = host?.scope === 'docker-desktop-vm' ? 'VM' : 'HOST';
|
||||||
const cpuPct = isDemoMode ? 14 : host && host.cpu.cores > 0
|
const cpuPct = isDemoMode ? 14 : host && host.cpu.cores > 0
|
||||||
? Math.min(100, Math.round((host.load.load1m / host.cpu.cores) * 100))
|
? Math.min(100, Math.round((host.load.load1m / host.cpu.cores) * 100))
|
||||||
: null;
|
: null;
|
||||||
@@ -220,7 +223,7 @@ export function ProjectsPage() {
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-2.5">
|
<div className="flex items-center gap-2.5">
|
||||||
<div className="search-box" style={{ width: 240 }}>
|
<div className="search-box" style={{ width: 'min(240px, 42vw)' }}>
|
||||||
<Search size={13} />
|
<Search size={13} />
|
||||||
<input
|
<input
|
||||||
value={search}
|
value={search}
|
||||||
@@ -230,16 +233,18 @@ export function ProjectsPage() {
|
|||||||
style={{ fontSize: 11.5 }}
|
style={{ fontSize: 11.5 }}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
{signedIn && (
|
||||||
<button onClick={openCreate} className="v-btn">
|
<button onClick={openCreate} className="v-btn">
|
||||||
+ new project
|
+ new project
|
||||||
</button>
|
</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Host stat row */}
|
{/* Host stat row */}
|
||||||
<div className="mb-7 grid grid-cols-2 gap-3 lg:grid-cols-4">
|
<div className="mb-7 grid grid-cols-2 gap-3 lg:grid-cols-4">
|
||||||
<div className="v-stat">
|
<div className="v-stat">
|
||||||
<div className="v-k"><span>HOST.CPU</span><span className="v-live" /></div>
|
<div className="v-k"><span>{hostLabel}.CPU</span><span className="v-live" /></div>
|
||||||
<div className="v-v">{cpuPct ?? '—'}<span>%</span></div>
|
<div className="v-v">{cpuPct ?? '—'}<span>%</span></div>
|
||||||
{isDemoMode ? (
|
{isDemoMode ? (
|
||||||
<div className="v-spark">
|
<div className="v-spark">
|
||||||
@@ -255,13 +260,13 @@ export function ProjectsPage() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="v-stat">
|
<div className="v-stat">
|
||||||
<div className="v-k"><span>HOST.MEM</span><span className="v-live" /></div>
|
<div className="v-k"><span>{hostLabel}.MEM</span><span className="v-live" /></div>
|
||||||
<div className="v-v">{memPct ?? '—'}<span>%</span></div>
|
<div className="v-v">{memPct ?? '—'}<span>%</span></div>
|
||||||
<div className="v-meter"><i className={memPct !== null && memPct > 85 ? 'r' : 'y'} style={{ width: `${memPct ?? 0}%` }} /></div>
|
<div className="v-meter"><i className={memPct !== null && memPct > 85 ? 'r' : 'y'} style={{ width: `${memPct ?? 0}%` }} /></div>
|
||||||
<div className="v-d">{isDemoMode ? '9.8G / 13G' : host ? `${fmtGB(host.memory.used)} / ${fmtGB(host.memory.total)}` : 'no telemetry'}</div>
|
<div className="v-d">{isDemoMode ? '9.8G / 13G' : host ? `${fmtGB(host.memory.used)} / ${fmtGB(host.memory.total)}` : 'no telemetry'}</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="v-stat">
|
<div className="v-stat">
|
||||||
<div className="v-k"><span>HOST.DISK</span><span className="v-live" /></div>
|
<div className="v-k"><span>{hostLabel}.DISK</span><span className="v-live" /></div>
|
||||||
<div className="v-v">{diskPct ?? '—'}<span>%</span></div>
|
<div className="v-v">{diskPct ?? '—'}<span>%</span></div>
|
||||||
<div className="v-meter"><i className="r" style={{ width: `${diskPct ?? 0}%` }} /></div>
|
<div className="v-meter"><i className="r" style={{ width: `${diskPct ?? 0}%` }} /></div>
|
||||||
<div className="v-d">{isDemoMode ? '338G of 465G · high' : host ? `${fmtGB(host.storage.used)} of ${fmtGB(host.storage.total)}` : 'no telemetry'}</div>
|
<div className="v-d">{isDemoMode ? '338G of 465G · high' : host ? `${fmtGB(host.storage.used)} of ${fmtGB(host.storage.total)}` : 'no telemetry'}</div>
|
||||||
|
|||||||
@@ -972,31 +972,60 @@ export function ServiceDetailPage() {
|
|||||||
<p className="text-sm font-medium text-[var(--text-primary)]">Networking</p>
|
<p className="text-sm font-medium text-[var(--text-primary)]">Networking</p>
|
||||||
<p className="text-xs text-[var(--text-tertiary)]">Public endpoints and ports</p>
|
<p className="text-xs text-[var(--text-tertiary)]">Public endpoints and ports</p>
|
||||||
</div>
|
</div>
|
||||||
|
{runtimeQuery.data?.health === 'healthy' && (
|
||||||
|
<span className="ml-auto v-st v-st-ok">HEALTHY</span>
|
||||||
|
)}
|
||||||
|
{runtimeQuery.data?.health === 'unhealthy' && (
|
||||||
|
<span className="ml-auto v-st v-st-fail">UNHEALTHY</span>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||||
|
{service.domain && (
|
||||||
<div className="flex items-center justify-between p-3 rounded-lg bg-[var(--surface-muted)] border border-[var(--border-subtle)]">
|
<div className="flex items-center justify-between p-3 rounded-lg bg-[var(--surface-muted)] border border-[var(--border-subtle)]">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<div className="w-2 h-2 rounded-full bg-[var(--success)]" />
|
<div className="w-2 h-2 rounded-full bg-[var(--success)]" />
|
||||||
<span className="text-xs text-[var(--text-secondary)]">HTTPS</span>
|
<span className="text-xs text-[var(--text-secondary)]">Domain</span>
|
||||||
</div>
|
</div>
|
||||||
<a
|
<a
|
||||||
href={`https://${service.name}.containr.dev`}
|
href={`https://${service.domain}`}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
className="mono text-xs text-[var(--accent-primary)] hover:underline"
|
className="mono text-xs text-[var(--accent-primary)] hover:underline"
|
||||||
>
|
>
|
||||||
{service.name}.containr.dev
|
{service.domain}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
|
{(runtimeQuery.data?.urls ?? []).map((url) => (
|
||||||
|
<div key={url} className="flex items-center justify-between p-3 rounded-lg bg-[var(--surface-muted)] border border-[var(--border-subtle)]">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<div className="w-2 h-2 rounded-full bg-[var(--success)]" />
|
||||||
|
<span className="text-xs text-[var(--text-secondary)]">HTTP</span>
|
||||||
|
</div>
|
||||||
|
<a
|
||||||
|
href={url}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className="mono text-xs text-[var(--accent-primary)] hover:underline"
|
||||||
|
>
|
||||||
|
{url.replace(/^https?:\/\//, '')}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
<div className="flex items-center justify-between p-3 rounded-lg bg-[var(--surface-muted)] border border-[var(--border-subtle)]">
|
<div className="flex items-center justify-between p-3 rounded-lg bg-[var(--surface-muted)] border border-[var(--border-subtle)]">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<div className="w-2 h-2 rounded-full bg-[var(--accent-secondary)]" />
|
<div className="w-2 h-2 rounded-full bg-[var(--accent-secondary)]" />
|
||||||
<span className="text-xs text-[var(--text-secondary)]">Port</span>
|
<span className="text-xs text-[var(--text-secondary)]">Internal</span>
|
||||||
</div>
|
</div>
|
||||||
<span className="mono text-xs text-[var(--text-primary)]">8080 → 443</span>
|
<span className="mono text-xs text-[var(--text-primary)]">{service.name}{service.port ? `:${service.port}` : ''}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{!service.domain && (runtimeQuery.data?.urls ?? []).length === 0 && (
|
||||||
|
<p className="mt-3 text-xs text-[var(--text-tertiary)]">
|
||||||
|
No public endpoint. Publish a port or set a domain in Settings → Networking to expose this service.
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1099,6 +1099,7 @@ function CanvasInner({ projectId, services, variablesByService, onAddService, on
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
{!readOnly && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => addGroup()}
|
onClick={() => addGroup()}
|
||||||
@@ -1108,6 +1109,7 @@ function CanvasInner({ projectId, services, variablesByService, onAddService, on
|
|||||||
<Layers size={13} />
|
<Layers size={13} />
|
||||||
Group
|
Group
|
||||||
</button>
|
</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Floating: zoom controls (bottom-left) */}
|
{/* Floating: zoom controls (bottom-left) */}
|
||||||
@@ -1170,6 +1172,7 @@ function CanvasInner({ projectId, services, variablesByService, onAddService, on
|
|||||||
Add a service from a git repo or Docker image - it runs on a private network with the rest of this
|
Add a service from a git repo or Docker image - it runs on a private network with the rest of this
|
||||||
project.
|
project.
|
||||||
</p>
|
</p>
|
||||||
|
{!readOnly && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={onAddService}
|
onClick={onAddService}
|
||||||
@@ -1179,6 +1182,7 @@ function CanvasInner({ projectId, services, variablesByService, onAddService, on
|
|||||||
<Plus size={15} />
|
<Plus size={15} />
|
||||||
Add Service
|
Add Service
|
||||||
</button>
|
</button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -1190,6 +1194,8 @@ function CanvasInner({ projectId, services, variablesByService, onAddService, on
|
|||||||
style={{ left: contextMenu.x, top: contextMenu.y }}
|
style={{ left: contextMenu.x, top: contextMenu.y }}
|
||||||
>
|
>
|
||||||
{contextMenu.kind === 'pane' && (
|
{contextMenu.kind === 'pane' && (
|
||||||
|
<>
|
||||||
|
{!readOnly && (
|
||||||
<>
|
<>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -1217,6 +1223,8 @@ function CanvasInner({ projectId, services, variablesByService, onAddService, on
|
|||||||
<Layers size={13} />
|
<Layers size={13} />
|
||||||
Add group here
|
Add group here
|
||||||
</button>
|
</button>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
<div className="border-t border-[var(--border-subtle)] mt-1 pt-1">
|
<div className="border-t border-[var(--border-subtle)] mt-1 pt-1">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
|||||||
@@ -719,7 +719,7 @@ export function ProjectWorkspacePage() {
|
|||||||
<Search size={12} />
|
<Search size={12} />
|
||||||
<kbd className="px-1 py-0.5 rounded bg-[var(--surface-card)] text-[10px] font-mono">⌘K</kbd>
|
<kbd className="px-1 py-0.5 rounded bg-[var(--surface-card)] text-[10px] font-mono">⌘K</kbd>
|
||||||
</button>
|
</button>
|
||||||
{!isDemoMode && (
|
{!isDemoMode && signedIn && (
|
||||||
<button
|
<button
|
||||||
onClick={openAddService}
|
onClick={openAddService}
|
||||||
className="flex items-center gap-1.5 h-8 px-3 rounded-[var(--radius-md)] text-[var(--accent-on)] text-xs font-semibold shadow-lg hover:shadow-xl transition-all"
|
className="flex items-center gap-1.5 h-8 px-3 rounded-[var(--radius-md)] text-[var(--accent-on)] text-xs font-semibold shadow-lg hover:shadow-xl transition-all"
|
||||||
@@ -742,7 +742,7 @@ export function ProjectWorkspacePage() {
|
|||||||
onAddService={openAddService}
|
onAddService={openAddService}
|
||||||
onOpenService={(serviceId) => navigate(serviceHref(serviceId))}
|
onOpenService={(serviceId) => navigate(serviceHref(serviceId))}
|
||||||
onOpenSection={(serviceId, section) => navigate(serviceSectionHref(serviceId, section))}
|
onOpenSection={(serviceId, section) => navigate(serviceSectionHref(serviceId, section))}
|
||||||
readOnly={isDemoMode}
|
readOnly={isDemoMode || !signedIn}
|
||||||
/>
|
/>
|
||||||
{isDemoMode && (
|
{isDemoMode && (
|
||||||
<div className="absolute top-4 left-1/2 -translate-x-1/2 pointer-events-none">
|
<div className="absolute top-4 left-1/2 -translate-x-1/2 pointer-events-none">
|
||||||
|
|||||||
@@ -637,7 +637,15 @@ export interface paths {
|
|||||||
desired?: number;
|
desired?: number;
|
||||||
/** @enum {string} */
|
/** @enum {string} */
|
||||||
status?: "running" | "degraded" | "stopped";
|
status?: "running" | "degraded" | "stopped";
|
||||||
|
/** @description Reachable service URLs; rewritten to the request Host for remote clients. Null/empty when nothing is published. */
|
||||||
urls?: string[];
|
urls?: string[];
|
||||||
|
/** @description Host ports actually bound for replica 0+; persisted on the service so restarts reuse the same public port. Null/empty when nothing is published. */
|
||||||
|
ports?: number[];
|
||||||
|
/**
|
||||||
|
* @description Result of the backend's HTTP probe of the service on its project network. Omitted when the service declares no healthcheck path.
|
||||||
|
* @enum {string}
|
||||||
|
*/
|
||||||
|
health?: "healthy" | "unhealthy" | "unreachable";
|
||||||
containers?: {
|
containers?: {
|
||||||
id?: string;
|
id?: string;
|
||||||
name?: string;
|
name?: string;
|
||||||
@@ -8299,7 +8307,13 @@ export interface components {
|
|||||||
images?: number;
|
images?: number;
|
||||||
driver?: string;
|
driver?: string;
|
||||||
server?: string;
|
server?: string;
|
||||||
|
os?: string;
|
||||||
};
|
};
|
||||||
|
/**
|
||||||
|
* @description What the telemetry measures — `host` for a native daemon, `docker-desktop-vm` when Docker runs inside a Desktop VM.
|
||||||
|
* @enum {string}
|
||||||
|
*/
|
||||||
|
scope?: "host" | "docker-desktop-vm";
|
||||||
/** Format: date-time */
|
/** Format: date-time */
|
||||||
collected_at?: string;
|
collected_at?: string;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1523,6 +1523,7 @@ textarea {
|
|||||||
background: var(--accent-primary); color: var(--accent-on);
|
background: var(--accent-primary); color: var(--accent-on);
|
||||||
border: none; border-radius: 8px; padding: 9px 17px;
|
border: none; border-radius: 8px; padding: 9px 17px;
|
||||||
font: 700 12px 'JetBrains Mono', monospace; cursor: pointer;
|
font: 700 12px 'JetBrains Mono', monospace; cursor: pointer;
|
||||||
|
white-space: nowrap; flex-shrink: 0;
|
||||||
transition: background 0.15s, transform 0.15s;
|
transition: background 0.15s, transform 0.15s;
|
||||||
box-shadow: 0 2px 12px rgba(180, 227, 74, 0.22);
|
box-shadow: 0 2px 12px rgba(180, 227, 74, 0.22);
|
||||||
}
|
}
|
||||||
@@ -1534,6 +1535,7 @@ textarea {
|
|||||||
background: var(--surface-card); color: var(--text-secondary);
|
background: var(--surface-card); color: var(--text-secondary);
|
||||||
border: 1px solid var(--border-subtle); border-radius: 8px; padding: 8px 16px;
|
border: 1px solid var(--border-subtle); border-radius: 8px; padding: 8px 16px;
|
||||||
font: 600 12px 'JetBrains Mono', monospace; cursor: pointer; transition: 0.15s;
|
font: 600 12px 'JetBrains Mono', monospace; cursor: pointer; transition: 0.15s;
|
||||||
|
white-space: nowrap; flex-shrink: 0;
|
||||||
}
|
}
|
||||||
.v-btn-ghost:hover { color: var(--text-primary); border-color: var(--border-default); }
|
.v-btn-ghost:hover { color: var(--text-primary); border-color: var(--border-default); }
|
||||||
|
|
||||||
|
|||||||
@@ -68,6 +68,8 @@ export type ServiceRuntime = {
|
|||||||
desired: number;
|
desired: number;
|
||||||
status: 'running' | 'degraded' | 'stopped';
|
status: 'running' | 'degraded' | 'stopped';
|
||||||
urls: string[];
|
urls: string[];
|
||||||
|
ports: number[];
|
||||||
|
health?: 'healthy' | 'unhealthy' | 'unreachable' | '';
|
||||||
containers: RuntimeContainer[];
|
containers: RuntimeContainer[];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -223,7 +225,9 @@ export type HostMonitoring = {
|
|||||||
images?: number;
|
images?: number;
|
||||||
driver?: string;
|
driver?: string;
|
||||||
server?: string;
|
server?: string;
|
||||||
|
os?: string;
|
||||||
};
|
};
|
||||||
|
scope: 'host' | 'docker-desktop-vm';
|
||||||
collectedAt: string;
|
collectedAt: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -886,6 +890,7 @@ function normalizeHostMonitoring(payload: RawHostMonitoring): HostMonitoring {
|
|||||||
uptimeSeconds: payload.uptime_seconds ?? 0,
|
uptimeSeconds: payload.uptime_seconds ?? 0,
|
||||||
dockerAvailable: Boolean(payload.docker_available),
|
dockerAvailable: Boolean(payload.docker_available),
|
||||||
docker: payload.docker,
|
docker: payload.docker,
|
||||||
|
scope: payload.scope === 'docker-desktop-vm' ? 'docker-desktop-vm' : 'host',
|
||||||
collectedAt: payload.collected_at ?? '',
|
collectedAt: payload.collected_at ?? '',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1080,16 +1085,15 @@ export async function deleteService(serviceId: string): Promise<void> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function normalizeRuntime(runtime?: ServiceRuntime): ServiceRuntime {
|
||||||
|
const state = runtime ?? { desired: 0, status: 'stopped' as const, urls: [], ports: [], containers: [] };
|
||||||
|
// The API emits null (not []) for empty collections — coerce at the boundary.
|
||||||
|
return { ...state, urls: state.urls ?? [], ports: state.ports ?? [], containers: state.containers ?? [] };
|
||||||
|
}
|
||||||
|
|
||||||
export async function getServiceRuntime(serviceId: string): Promise<ServiceRuntime> {
|
export async function getServiceRuntime(serviceId: string): Promise<ServiceRuntime> {
|
||||||
const payload = await requestJson<{ runtime?: ServiceRuntime }>(`/services/${serviceId}/runtime`);
|
const payload = await requestJson<{ runtime?: ServiceRuntime }>(`/services/${serviceId}/runtime`);
|
||||||
return (
|
return normalizeRuntime(payload.runtime);
|
||||||
payload.runtime ?? {
|
|
||||||
desired: 0,
|
|
||||||
status: 'stopped',
|
|
||||||
urls: [],
|
|
||||||
containers: [],
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function serviceAction(serviceId: string, action: 'start' | 'stop' | 'restart'): Promise<void> {
|
async function serviceAction(serviceId: string, action: 'start' | 'stop' | 'restart'): Promise<void> {
|
||||||
@@ -1104,7 +1108,7 @@ export async function redeployService(serviceId: string): Promise<ServiceRuntime
|
|||||||
const payload = await requestJson<{ runtime?: ServiceRuntime }>(`/services/${serviceId}/redeploy`, {
|
const payload = await requestJson<{ runtime?: ServiceRuntime }>(`/services/${serviceId}/redeploy`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
});
|
});
|
||||||
return payload.runtime ?? { desired: 0, status: 'stopped', urls: [], containers: [] };
|
return normalizeRuntime(payload.runtime);
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeServiceVariables(rows: RawServiceVariable[] | undefined): ServiceVariable[] {
|
function normalizeServiceVariables(rows: RawServiceVariable[] | undefined): ServiceVariable[] {
|
||||||
|
|||||||
@@ -456,6 +456,7 @@ export const demoHostMonitoring: HostMonitoring = {
|
|||||||
uptimeSeconds: 1_828_800,
|
uptimeSeconds: 1_828_800,
|
||||||
dockerAvailable: true,
|
dockerAvailable: true,
|
||||||
docker: { containers: 11, images: 34, driver: 'overlay2', server: '27.3.1' },
|
docker: { containers: 11, images: 34, driver: 'overlay2', server: '27.3.1' },
|
||||||
|
scope: 'host',
|
||||||
collectedAt: new Date().toISOString(),
|
collectedAt: new Date().toISOString(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Vendored
-2
@@ -1,2 +0,0 @@
|
|||||||
declare const _default: import("vite").UserConfig;
|
|
||||||
export default _default;
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
import { defineConfig } from 'vite';
|
|
||||||
import react from '@vitejs/plugin-react';
|
|
||||||
import path from 'path';
|
|
||||||
// https://vite.dev/config/
|
|
||||||
export default defineConfig({
|
|
||||||
plugins: [react()],
|
|
||||||
resolve: {
|
|
||||||
alias: {
|
|
||||||
"@": path.resolve(__dirname, "./src"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
build: {
|
|
||||||
// Enable code splitting and optimization
|
|
||||||
rollupOptions: {
|
|
||||||
output: {
|
|
||||||
manualChunks: {
|
|
||||||
// Split vendor libraries
|
|
||||||
vendor: ['react', 'react-dom', '@tanstack/react-query'],
|
|
||||||
ui: ['@radix-ui/react-dialog', '@radix-ui/react-dropdown-menu', 'lucide-react'],
|
|
||||||
utils: ['date-fns', 'clsx', 'tailwind-merge']
|
|
||||||
},
|
|
||||||
// Optimize chunk naming for better caching
|
|
||||||
chunkFileNames: 'assets/js/[name]-[hash].js',
|
|
||||||
entryFileNames: 'assets/js/[name]-[hash].js',
|
|
||||||
assetFileNames: 'assets/[ext]/[name]-[hash].[ext]'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// Enable source maps for production debugging
|
|
||||||
sourcemap: true,
|
|
||||||
// Optimize bundle size
|
|
||||||
minify: 'terser',
|
|
||||||
// Set appropriate chunk size limit for better caching
|
|
||||||
chunkSizeWarningLimit: 1000
|
|
||||||
},
|
|
||||||
// Optimize dependencies during build
|
|
||||||
optimizeDeps: {
|
|
||||||
include: ['react', 'react-dom', '@tanstack/react-query', 'date-fns']
|
|
||||||
},
|
|
||||||
// Development server optimization
|
|
||||||
server: {
|
|
||||||
fs: {
|
|
||||||
// Allow serving files from project root
|
|
||||||
allow: ['..']
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// Preview server optimization
|
|
||||||
preview: {
|
|
||||||
port: 4173,
|
|
||||||
strictPort: true
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@@ -30,7 +30,9 @@ export default defineConfig({
|
|||||||
// Split vendor libraries
|
// Split vendor libraries
|
||||||
vendor: ['react', 'react-dom', '@tanstack/react-query'],
|
vendor: ['react', 'react-dom', '@tanstack/react-query'],
|
||||||
ui: ['@radix-ui/react-dialog', '@radix-ui/react-dropdown-menu', 'lucide-react'],
|
ui: ['@radix-ui/react-dialog', '@radix-ui/react-dropdown-menu', 'lucide-react'],
|
||||||
utils: ['date-fns', 'clsx', 'tailwind-merge']
|
utils: ['date-fns', 'clsx', 'tailwind-merge'],
|
||||||
|
canvas: ['@xyflow/react'],
|
||||||
|
charts: ['recharts']
|
||||||
},
|
},
|
||||||
// Optimize chunk naming for better caching
|
// Optimize chunk naming for better caching
|
||||||
chunkFileNames: 'assets/js/[name]-[hash].js',
|
chunkFileNames: 'assets/js/[name]-[hash].js',
|
||||||
|
|||||||
@@ -458,6 +458,16 @@ paths:
|
|||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
type: string
|
type: string
|
||||||
|
description: Reachable service URLs; rewritten to the request Host for remote clients. Null/empty when nothing is published.
|
||||||
|
ports:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: integer
|
||||||
|
description: Host ports actually bound for replica 0+; persisted on the service so restarts reuse the same public port. Null/empty when nothing is published.
|
||||||
|
health:
|
||||||
|
type: string
|
||||||
|
enum: [healthy, unhealthy, unreachable]
|
||||||
|
description: Result of the backend's HTTP probe of the service on its project network. Omitted when the service declares no healthcheck path.
|
||||||
containers:
|
containers:
|
||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
@@ -6052,6 +6062,12 @@ components:
|
|||||||
type: string
|
type: string
|
||||||
server:
|
server:
|
||||||
type: string
|
type: string
|
||||||
|
os:
|
||||||
|
type: string
|
||||||
|
scope:
|
||||||
|
type: string
|
||||||
|
description: What the telemetry measures — `host` for a native daemon, `docker-desktop-vm` when Docker runs inside a Desktop VM.
|
||||||
|
enum: [host, docker-desktop-vm]
|
||||||
collected_at:
|
collected_at:
|
||||||
type: string
|
type: string
|
||||||
format: date-time
|
format: date-time
|
||||||
|
|||||||
Reference in new issue
Block a user