Add local docker-compose file and unique project name to compose command.

Author: Phillip Simonds

.env.example

@@ -36,6 +36,13 @@ export INFRAHUB_ENTERPRISE=false
 #   - Bootstrap script loads objects/git-repo/github.yml
 export INFRAHUB_GIT_LOCAL=false
 
+# Docker Compose project name
+# Used to namespace Docker containers. Set different values for each instance
+# when running multiple copies of this project in parallel.
+# Defaults to the directory name if not set.
+# Example: infrahub-bug1, infrahub-bug2, etc.
+# export INFRAHUB_PROJECT_NAME=infrahub-bundle-dc
+
 # =============================================================================
 # Service Catalog Configuration
 # =============================================================================

.gitignore

@@ -14,6 +14,7 @@
 **/*.clab.yml.bak
 **/*.tar.xz
 docker-compose.yml
+docker-compose.local.yml
 generated-configs/
 infrahub_backups/
 infrahub_bundle_dc.egg-info

docker-compose.local.yml.example

@@ -0,0 +1,38 @@
+---
+# Local Docker Compose overrides (gitignored)
+#
+# Copy this file to docker-compose.local.yml to customize ports and other
+# settings for running multiple instances of this project in parallel.
+#
+# This file is layered on top of docker-compose.yml and docker-compose.override.yml,
+# so you only need to specify the settings you want to change.
+#
+# Example: To run a second instance on different ports:
+#   1. Clone the repo to a different directory (e.g., infrahub-bundle-dc-2)
+#   2. Copy this file to docker-compose.local.yml
+#   3. Set INFRAHUB_PROJECT_NAME in your .env (e.g., infrahub-2)
+#   4. Uncomment and adjust the ports below
+#
+# Common port offsets for multiple instances:
+#   Instance 1: 8000, 4200, 8501 (default)
+#   Instance 2: 8100, 4201, 8502
+#   Instance 3: 8200, 4202, 8503
+
+services:
+  # Infrahub server (default: 8000)
+  infrahub-server:
+    ports:
+      - "8100:8000"
+
+  # Prefect task manager UI (default: 4200)
+  task-manager:
+    ports:
+      - "4201:4200"
+
+  # Service catalog Streamlit app (default: 8501)
+  streamlit-service-catalog:
+    ports:
+      - "8502:8501"
+    environment:
+      # Update this to match your Infrahub server port
+      - INFRAHUB_UI_URL=http://localhost:8100

tasks.py

@@ -26,31 +26,59 @@
 INFRAHUB_SERVICE_CATALOG = os.getenv("INFRAHUB_SERVICE_CATALOG", "false").lower() == "true"
 INFRAHUB_GIT_LOCAL = os.getenv("INFRAHUB_GIT_LOCAL", "false").lower() == "true"
 MAIN_DIRECTORY_PATH = Path(__file__).parent
+INFRAHUB_PROJECT_NAME = os.getenv("INFRAHUB_PROJECT_NAME", MAIN_DIRECTORY_PATH.name)
 
 
 # Download compose file and use with override
 def get_compose_command() -> str:
-    """Generate docker compose command with override support."""
+    """Generate docker compose command with override support.
+
+    Supports layered compose files:
+    1. docker-compose.yml (base, downloaded or local)
+    2. docker-compose.override.yml (committed overrides)
+    3. docker-compose.local.yml (gitignored, for local port/project customization)
+
+    The project name is controlled by INFRAHUB_PROJECT_NAME env var,
+    defaulting to the directory name.
+    """
     local_compose_file = MAIN_DIRECTORY_PATH / "docker-compose.yml"
     override_file = MAIN_DIRECTORY_PATH / "docker-compose.override.yml"
+    local_file = MAIN_DIRECTORY_PATH / "docker-compose.local.yml"
+
+    # Build list of compose file arguments
+    compose_files: list[str] = []
+
+    # Check if local docker-compose.yml exists, otherwise use remote
+    if local_compose_file.exists():
+        compose_files.append(str(local_compose_file))
+    else:
+        # Will use curl pipe, handled separately below
+        pass
+
+    # Add optional override files
+    if override_file.exists():
+        compose_files.append(str(override_file))
+    if local_file.exists():
+        compose_files.append(str(local_file))
 
-    # Check if local docker-compose.yml exists
+    # Build the file arguments string
+    file_args = " ".join(f"-f {f}" for f in compose_files)
+    base_cmd = f"docker compose -p {INFRAHUB_PROJECT_NAME}"
+
+    # If we have a local compose file, use it directly
     if local_compose_file.exists():
-        # Use local docker-compose.yml file
-        if override_file.exists():
-            return f"docker compose -p infrahub -f {local_compose_file} -f {override_file}"
-        return f"docker compose -p infrahub-bundle-dc -f {local_compose_file}"
+        return f"{base_cmd} {file_args}"
 
     # Fall back to downloading from infrahub.opsmill.io
-    # Determine the base URL based on edition
     if INFRAHUB_ENTERPRISE:
         base_url = f"https://infrahub.opsmill.io/enterprise/{INFRAHUB_VERSION}"
     else:
         base_url = f"https://infrahub.opsmill.io/{INFRAHUB_VERSION}"
 
-    if override_file.exists():
-        return f"curl -s {base_url} | docker compose -p infrahub -f - -f {override_file}"
-    return f"curl -s {base_url} | docker compose -p infrahub -f -"
+    # For curl pipe, stdin is the first file
+    if file_args:
+        return f"curl -s {base_url} | {base_cmd} -f - {file_args}"
+    return f"curl -s {base_url} | {base_cmd} -f -"
 
 
 def get_compose_source() -> str:
@@ -119,6 +147,7 @@ def info(context: Context) -> None:
     info_msg = (
         f"[cyan]Edition:[/cyan] {edition}\n"
         f"[cyan]Version:[/cyan] {INFRAHUB_VERSION}\n"
+        f"[cyan]Project Name:[/cyan] {INFRAHUB_PROJECT_NAME}\n"
         f"[cyan]Compose Source:[/cyan] {COMPOSE_SOURCE}\n"
         f"[cyan]Service Catalog:[/cyan] {'Enabled' if INFRAHUB_SERVICE_CATALOG else 'Disabled'}\n"
         f"[cyan]Local Git Repository:[/cyan] {'Enabled' if INFRAHUB_GIT_LOCAL else 'Disabled'}\n"