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

Author: zhravan

.github/workflows/build_container.yml

@@ -40,6 +40,8 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
 
       - name: Cache Docker layers
         uses: actions/cache@v4
@@ -72,6 +74,7 @@ jobs:
         with:
           context: ./api
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta-api.outputs.tags }}
           labels: ${{ steps.meta-api.outputs.labels }}
           build-args: |
@@ -100,6 +103,7 @@ jobs:
         with:
           context: ./view
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta-view.outputs.tags }}
           labels: ${{ steps.meta-view.outputs.labels }}
           build-args: |

CHANGELOG.md

@@ -1,3 +1,76 @@
+# [0.1.0-alpha.65](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.64...v0.1.0-alpha.65) (2025-11-09)
+
+
+### Bug Fixes
+
+* remove linux/arm/v7 support since no native support from postcss and Nextjs sharp ([#576](https://github.com/raghavyuva/nixopus/issues/576)) ([dc84f0e](https://github.com/raghavyuva/nixopus/commit/dc84f0ef1c1a2568885fdd02e144b91ebe19d8a1))
+
+
+
+# [0.1.0-alpha.64](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.63...v0.1.0-alpha.64) (2025-11-08)
+
+
+### Bug Fixes
+
+* update docker compose files to use internal ports for supertokens postgres connection ([9a23b2c](https://github.com/raghavyuva/nixopus/commit/9a23b2c4552b4f6905dd6d501ed0a40cddf362c0))
+
+
+
+# [0.1.0-alpha.63](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.62...v0.1.0-alpha.63) (2025-11-08)
+
+
+### Bug Fixes
+
+* malformed supertokens connection uri during ip based installations ([b6b1ad5](https://github.com/raghavyuva/nixopus/commit/b6b1ad5ec11b3eda9caac692c0cad3cba59adbc9))
+
+
+
+# [0.1.0-alpha.62](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.61...v0.1.0-alpha.62) (2025-11-08)
+
+
+### Bug Fixes
+
+* always binds predictable ports inside the container, and uses dynamic ports for the host ([#569](https://github.com/raghavyuva/nixopus/issues/569)) ([e5e637e](https://github.com/raghavyuva/nixopus/commit/e5e637eabddfa02ed03b32de338004ed5efcfaa8))
+
+
+### Features
+
+* add support for linux/amd64 linux/arm54 linux/arm/v7 ([#570](https://github.com/raghavyuva/nixopus/issues/570)) ([59938ad](https://github.com/raghavyuva/nixopus/commit/59938ad28932854c9b0d2388b37ceeb28a8a1ab9))
+
+
+
+# [0.1.0-alpha.61](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.60...v0.1.0-alpha.61) (2025-11-08)
+
+
+### Features
+
+* add support for custom ports during nixopus install ([#567](https://github.com/raghavyuva/nixopus/issues/567)) ([01c4b1d](https://github.com/raghavyuva/nixopus/commit/01c4b1d8a116fde1cf992cef4face3728e55e039))
+
+
+
+# [0.1.0-alpha.60](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.59...v0.1.0-alpha.60) (2025-11-05)
+
+
+### Bug Fixes
+
+* nixopus uninstall hangs or silently asks for confirmation from user which is not identical ([#560](https://github.com/raghavyuva/nixopus/issues/560)) ([5a9c7f8](https://github.com/raghavyuva/nixopus/commit/5a9c7f8cb7ec347a907ba51de4a9e6bc59f707ec))
+
+
+### Features
+
+* add support for custom config file during nixopus installation ([#561](https://github.com/raghavyuva/nixopus/issues/561)) ([0b34f84](https://github.com/raghavyuva/nixopus/commit/0b34f84e02345f2bb583be587c7f4676b72c6523))
+
+
+
+# [0.1.0-alpha.59](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.58...v0.1.0-alpha.59) (2025-11-04)
+
+
+### Features
+
+* add support for custom ip address deployments ([#554](https://github.com/raghavyuva/nixopus/issues/554)) ([d1fb0b4](https://github.com/raghavyuva/nixopus/commit/d1fb0b42fdfad3709180c0ffb1d4725d1e5c8e7b))
+
+
+
 # [0.1.0-alpha.58](https://github.com/raghavyuva/nixopus/compare/v0.1.0-alpha.57...v0.1.0-alpha.58) (2025-11-02)
 
 

README.md

@@ -41,6 +41,12 @@ This section will help you set up Nixopus on your VPS quickly.
 curl -sSL https://install.nixopus.com | bash
 ```
 
+**For custom ip setups:**
+
+```bash
+curl -sSL https://install.nixopus.com | bash -s -- --host-ip 10.0.0.154
+```
+
 **To install only the CLI tool without running `nixopus install`:**
 
 ```bash
@@ -53,6 +59,7 @@ You can customize your installation by providing the following optional paramete
 
 - `--api-domain` or `-ad`: Specify the domain where the Nixopus API will be accessible (e.g., `nixopusapi.example.tld`)
 - `--view-domain` or `-vd`: Specify the domain where the Nixopus app will be accessible (e.g., `nixopus.example.tld`)
+- `--host-ip` or `-ip`: Specify the IP address of the server to use when no domains are provided (e.g., `10.0.0.154` or `192.168.1.100`). If not provided, the public IP will be automatically detected.
 - `--verbose` or `-v`: Show more details while installing
 - `--timeout` or `-t`: Set timeout for each step (default: 300 seconds)
 - `--force` or `-f`: Replace files if they already exist
@@ -69,6 +76,14 @@ nixopus install \
   --timeout 600
 ```
 
+Example for custom ip setup:
+
+```bash
+nixopus install \
+  --host-ip 10.0.0.154 \
+  --verbose
+```
+
 You can also install the CLI and run `nixopus install` with options in a single command, refer [installation documentation](https://docs.nixopus.com/install/#installation-options) for more details on options
 
 ## About the Name

api/internal/features/deploy/proxy/caddy.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"time"
 
 	"github.com/raghavyuva/nixopus-api/internal/config"
@@ -15,7 +16,11 @@ import (
 func NewCaddy(logger *logger.Logger, rootDir string, domain string, port string, fileServerType FileServerType) *Caddy {
 	endpoint := config.AppConfig.Proxy.CaddyEndpoint
 	if endpoint == "" {
-		endpoint = "http://127.0.0.1:2019"
+		caddyPort := os.Getenv("CADDY_ADMIN_PORT")
+		if caddyPort == "" {
+			caddyPort = "2019"
+		}
+		endpoint = "http://127.0.0.1:" + caddyPort
 	}
 	return &Caddy{
 		Logger:   logger,

cli/app/commands/conflict/conflict.py

@@ -289,20 +289,13 @@ def check_conflicts(self) -> List[ConflictCheckResult]:
 
     def _load_user_config(self, config_path: Optional[str]) -> Dict[str, Any]:
         """Load configuration.
-        - If config_path is provided, load it as user config (overrides only what it contains).
+        - If config_path is provided, load it as user config (replaces default config).
         - If None, fall back to the built-in config used by Config (same as install command).
         """
         try:
-            if not config_path:
-                # Built-in config (nested dict) as default
-                self.logger.debug("Loading built-in configuration (no --config-file provided)")
-                return self.yaml_config.load_yaml_config()
-
-            # Load user config and unflatten to nested structure
-            self.logger.debug(conflict_loading_config.format(path=config_path))
-            flattened_config = self.yaml_config.load_user_config(config_path)
-            self.logger.debug(conflict_config_loaded)
-            return self.yaml_config.unflatten_config(flattened_config)
+            self.yaml_config.load_user_config(config_path)
+            self.logger.debug(conflict_loading_config.format(path=config_path) if config_path else "Loading built-in configuration (no --config-file provided)")
+            return self.yaml_config.load_yaml_config()
 
         except FileNotFoundError:
             raise FileNotFoundError(conflict_config_not_found.format(path=config_path))

cli/app/commands/install/base.py

@@ -29,24 +29,14 @@ def __init__(
         self.config_file = config_file
         self.repo = repo
         self.branch = branch
-        self._user_config = Config().load_user_config(self.config_file)
+        self._config = Config()
+        self._config.load_user_config(self.config_file)
         self.progress = None
         self.main_task = None
 
-    def _get_config(self, key: str, user_config: dict = None, defaults: dict = None):
+    def _get_config(self, path: str):
         """Base config getter - override in subclasses for specific behavior"""
-        config = Config()
-        
-        # Override repo_url and branch_name if provided via command line
-        if key == "repo_url" and self.repo is not None:
-            return self.repo
-        if key == "branch_name" and self.branch is not None:
-            return self.branch
-        
-        try:
-            return config.get_config_value(key, user_config or self._user_config, defaults or {})
-        except ValueError:
-            raise ValueError(configuration_key_has_no_default_value.format(key=key))
+        return self._config.get(path)
 
     def _validate_domains(self, api_domain: str = None, view_domain: str = None):
         """Validate domain format"""

cli/app/commands/install/command.py

@@ -45,6 +45,20 @@ def install_callback(
         "-vd",
         help="The domain where the nixopus view will be accessible (e.g. nixopus.com), if not provided you can use the ip address of the server and the port (e.g. 192.168.1.100:80)",
     ),
+    host_ip: str = typer.Option(
+        None,
+        "--host-ip",
+        "-ip",
+        help="The IP address of the server to use when no domains are provided (e.g. 10.0.0.154 or 192.168.1.100). If not provided, the public IP will be automatically detected.",
+    ),
+    api_port: int = typer.Option(None, "--api-port", help="Port for the API service (default: 8443 for production, 8080 for development)"),
+    view_port: int = typer.Option(None, "--view-port", help="Port for the View/Frontend service (default: 7443 for production, 3000 for development)"),
+    db_port: int = typer.Option(None, "--db-port", help="Port for the PostgreSQL database (default: 5432)"),
+    redis_port: int = typer.Option(None, "--redis-port", help="Port for the Redis service (default: 6379)"),
+    caddy_admin_port: int = typer.Option(None, "--caddy-admin-port", help="Port for Caddy admin API (default: 2019)"),
+    caddy_http_port: int = typer.Option(None, "--caddy-http-port", help="Port for Caddy HTTP traffic (default: 80)"),
+    caddy_https_port: int = typer.Option(None, "--caddy-https-port", help="Port for Caddy HTTPS traffic (default: 443)"),
+    supertokens_port: int = typer.Option(None, "--supertokens-port", help="Port for SuperTokens service (default: 3567)"),
     repo: str = typer.Option(None, "--repo", "-r", help="GitHub repository URL to clone (defaults to config value)"),
     branch: str = typer.Option(None, "--branch", "-b", help="Git branch to clone (defaults to config value)"),
 ):
@@ -65,6 +79,14 @@ def install_callback(
                 repo=repo,
                 branch=branch,
                 install_path=dev_path,
+                api_port=api_port,
+                view_port=view_port,
+                db_port=db_port,
+                redis_port=redis_port,
+                caddy_admin_port=caddy_admin_port,
+                caddy_http_port=caddy_http_port,
+                caddy_https_port=caddy_https_port,
+                supertokens_port=supertokens_port,
             )
             dev_install.run()
         else:
@@ -77,8 +99,17 @@ def install_callback(
                 config_file=config_file,
                 api_domain=api_domain,
                 view_domain=view_domain,
+                host_ip=host_ip,
                 repo=repo,
                 branch=branch,
+                api_port=api_port,
+                view_port=view_port,
+                db_port=db_port,
+                redis_port=redis_port,
+                caddy_admin_port=caddy_admin_port,
+                caddy_http_port=caddy_http_port,
+                caddy_https_port=caddy_https_port,
+                supertokens_port=supertokens_port,
             )
             install.run()
 
@@ -110,6 +141,14 @@ def development(
     ),
     repo: str = typer.Option(None, "--repo", "-r", help="GitHub repository URL to clone (defaults to config value)"),
     branch: str = typer.Option(None, "--branch", "-b", help="Git branch to clone (defaults to config value)"),
+    api_port: int = typer.Option(None, "--api-port", help="Port for the API service (default: 8080)"),
+    view_port: int = typer.Option(None, "--view-port", help="Port for the View/Frontend service (default: 3000)"),
+    db_port: int = typer.Option(None, "--db-port", help="Port for the PostgreSQL database (default: 5432)"),
+    redis_port: int = typer.Option(None, "--redis-port", help="Port for the Redis service (default: 6379)"),
+    caddy_admin_port: int = typer.Option(None, "--caddy-admin-port", help="Port for Caddy admin API (default: 2019)"),
+    caddy_http_port: int = typer.Option(None, "--caddy-http-port", help="Port for Caddy HTTP traffic (default: 80)"),
+    caddy_https_port: int = typer.Option(None, "--caddy-https-port", help="Port for Caddy HTTPS traffic (default: 443)"),
+    supertokens_port: int = typer.Option(None, "--supertokens-port", help="Port for SuperTokens service (default: 3567)"),
 ):
     """Install Nixopus for local development in specified or current directory"""
     logger = Logger(verbose=verbose)
@@ -123,6 +162,14 @@ def development(
         repo=repo,
         branch=branch,
         install_path=path,
+        api_port=api_port,
+        view_port=view_port,
+        db_port=db_port,
+        redis_port=redis_port,
+        caddy_admin_port=caddy_admin_port,
+        caddy_http_port=caddy_http_port,
+        caddy_https_port=caddy_https_port,
+        supertokens_port=supertokens_port,
     )
     install.run()