Merge branch 'master' of https://github.com/raghavyuva/nixopus

Author: zhravan

CHANGELOG.md

@@ -1,3 +1,21 @@
+# [0.1.0-alpha.67](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.66...v0.1.0-alpha.67) (2025-11-21)
+
+
+### Features
+
+* compose as extensions ([#555](https://github.com/raghavyuva/nixopus/issues/555)) ([741aa6a](https://github.com/raghavyuva/nixopus/commit/741aa6ab30520f46cc796c6510ea9c2551c4fd8e))
+
+
+
+# [0.1.0-alpha.66](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.65...v0.1.0-alpha.66) (2025-11-21)
+
+
+### Bug Fixes
+
+* allow custom ports on install setup optionally ([#580](https://github.com/raghavyuva/nixopus/issues/580)) ([972c7ac](https://github.com/raghavyuva/nixopus/commit/972c7ac4ea2aedd7810954772c4d16d7226182d6))
+
+
+
 # [0.1.0-alpha.65](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.64...v0.1.0-alpha.65) (2025-11-09)
 
 

api/internal/features/deploy/docker/init.go

@@ -331,7 +331,8 @@ func (s *DockerService) ComposeUp(composeFilePath string, envVars map[string]str
 	for k, v := range envVars {
 		envVarsStr += fmt.Sprintf("export %s=%s && ", k, v)
 	}
-	command := fmt.Sprintf("%sdocker compose -f %s up -d", envVarsStr, composeFilePath)
+	// Use --force-recreate to handle existing containers and --remove-orphans to clean up old containers
+	command := fmt.Sprintf("%sdocker compose -f %s up -d --force-recreate --remove-orphans 2>&1", envVarsStr, composeFilePath)
 	output, err := client.RunCommand(command)
 	if err != nil {
 		return fmt.Errorf("failed to start docker compose services: %v, output: %s", err, output)

api/internal/features/extension/engine/docker_compose.go

@@ -14,13 +14,15 @@ type dockerComposeModule struct{}
 func (dockerComposeModule) Type() string { return "docker_compose" }
 
 func (dockerComposeModule) Execute(_ *ssh.SSH, step types.SpecStep, vars map[string]interface{}) (string, func(), error) {
-	file, _ := step.Properties["file"].(string)
+	fileRaw, _ := step.Properties["file"].(string)
 	action, _ := step.Properties["action"].(string) // up, down, pull, build, restart
 	_, _ = step.Properties["project"].(string)
 	_, _ = step.Properties["args"].(string)
 	revertCmdRaw, _ := step.Properties["revert_cmd"].(string)
 	_, _ = step.Properties["user"].(string)
 
+	file := replaceVars(fileRaw, vars)
+
 	if action == "" {
 		return "", nil, fmt.Errorf("docker_compose action is required")
 	}

api/internal/features/extension/engine/file.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/pkg/sftp"
 	"github.com/raghavyuva/nixopus-api/internal/features/ssh"
@@ -108,10 +109,36 @@ var actionHandlers = map[string]fileAction{
 	"mkdir":  handleMkdir,
 }
 
+// expandTilde expands ~ to the actual home directory path for SFTP compatibility
+func expandTilde(path string, sshClient *ssh.SSH) string {
+	if len(path) > 0 && path[0] == '~' {
+		if len(path) == 1 || path[1] == '/' {
+			// Get home directory via command
+			homeOutput, err := sshClient.RunCommand("echo $HOME")
+			if err == nil && len(homeOutput) > 0 {
+				home := strings.TrimSpace(homeOutput)
+				if len(path) == 1 {
+					return home
+				}
+				return home + path[1:]
+			}
+		}
+	}
+	return path
+}
+
 func (fileModule) Execute(sshClient *ssh.SSH, step types.SpecStep, vars map[string]interface{}) (string, func(), error) {
 	action, _ := step.Properties["action"].(string)
-	src, _ := step.Properties["src"].(string)
-	dest, _ := step.Properties["dest"].(string)
+	srcRaw, _ := step.Properties["src"].(string)
+	destRaw, _ := step.Properties["dest"].(string)
+
+	// Replace variables in src and dest paths
+	src := replaceVars(srcRaw, vars)
+	dest := replaceVars(destRaw, vars)
+
+	// Expand tilde to $HOME for SFTP compatibility
+	src = expandTilde(src, sshClient)
+	dest = expandTilde(dest, sshClient)
 
 	if action == "mkdir" && dest == "" {
 		return "", nil, fmt.Errorf("dest is required for mkdir action")

api/internal/features/extension/engine/package.go

@@ -13,8 +13,12 @@ type packageModule struct{}
 func (packageModule) Type() string { return "package" }
 
 func (packageModule) Execute(sshClient *ssh.SSH, step types.SpecStep, vars map[string]interface{}) (string, func(), error) {
-	name, _ := step.Properties["name"].(string)
-	state, _ := step.Properties["state"].(string)
+	nameRaw, _ := step.Properties["name"].(string)
+	stateRaw, _ := step.Properties["state"].(string)
+
+	name := replaceVars(nameRaw, vars)
+	state := replaceVars(stateRaw, vars)
+
 	if name == "" {
 		return "", nil, fmt.Errorf("package name is required")
 	}

api/internal/features/extension/engine/service.go

@@ -12,10 +12,14 @@ type serviceModule struct{}
 func (serviceModule) Type() string { return "service" }
 
 func (serviceModule) Execute(sshClient *ssh.SSH, step types.SpecStep, vars map[string]interface{}) (string, func(), error) {
-	name, _ := step.Properties["name"].(string)
+	nameRaw, _ := step.Properties["name"].(string)
 	action, _ := step.Properties["action"].(string)
 	revertAction, _ := step.Properties["revert_action"].(string)
-	runAsUser, _ := step.Properties["user"].(string)
+	runAsUserRaw, _ := step.Properties["user"].(string)
+
+	name := replaceVars(nameRaw, vars)
+	runAsUser := replaceVars(runAsUserRaw, vars)
+
 	if name == "" {
 		return "", nil, fmt.Errorf("service name is required for service step")
 	}

api/internal/features/extension/engine/user.go

@@ -13,13 +13,18 @@ type userModule struct{}
 func (userModule) Type() string { return "user" }
 
 func (userModule) Execute(sshClient *ssh.SSH, step types.SpecStep, vars map[string]interface{}) (string, func(), error) {
-	username, _ := step.Properties["username"].(string)
+	usernameRaw, _ := step.Properties["username"].(string)
 	action, _ := step.Properties["action"].(string)
-	shell, _ := step.Properties["shell"].(string)
-	home, _ := step.Properties["home"].(string)
-	groups, _ := step.Properties["groups"].(string)
+	shellRaw, _ := step.Properties["shell"].(string)
+	homeRaw, _ := step.Properties["home"].(string)
+	groupsRaw, _ := step.Properties["groups"].(string)
 	revertAction, _ := step.Properties["revert_action"].(string)
 
+	username := replaceVars(usernameRaw, vars)
+	shell := replaceVars(shellRaw, vars)
+	home := replaceVars(homeRaw, vars)
+	groups := replaceVars(groupsRaw, vars)
+
 	if username == "" {
 		return "", nil, fmt.Errorf("username is required for user operations")
 	}

api/internal/features/ssh/init.go

@@ -135,10 +135,11 @@ func (s *SSH) RunCommand(cmd string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	output, err := client.Run(cmd)
+	defer client.Close()
 
+	output, err := client.Run(cmd)
 	if err != nil {
-		return "", err
+		return string(output), err
 	}
 
 	return string(output), nil