Feature/rick version merge

.github/workflows/build-documentation.yml

@@ -1,5 +1,6 @@
 name: Build documentation
 on:
+  workflow_dispatch:
   push:
     paths:
       - docs/**
@@ -12,11 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
-      - name: Run Sphinx documentation build
-        uses: ammaraskar/sphinx-action@0.4
+        uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          docs-folder: "docs/"
+          python-version: '3.11'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r docs/requirements.txt
+      - name: Build documentation with Sphinx
+        run: |
+          cd docs
+          sphinx-build -b html . _build/html
       - name: Upload documentation artifact
         uses: actions/upload-artifact@v4
         with:

.github/workflows/pages.yml

@@ -8,6 +8,7 @@ on:
     paths:
       - docs/**
       - .github/workflows/build-documentation.yml
+      - .github/workflows/pages.yml
       - CHANGELOG.md
 
   # Allows you to run this workflow manually from the Actions tab
@@ -33,18 +34,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Pages
-        uses: actions/configure-pages@v3
-      - name: Run Sphinx documentation build
-        uses: ammaraskar/sphinx-action@0.4
+        uses: actions/configure-pages@v5
+      - name: Set up Python
+        uses: actions/setup-python@v5
         with:
-          docs-folder: "docs/"
+          python-version: '3.11'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r docs/requirements.txt
+      - name: Build documentation with Sphinx
+        run: |
+          cd docs
+          sphinx-build -b html . _build/html
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
-          # Upload entire repository
           path: 'docs/_build/html/'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

.github/workflows/push-release-to-brew.yml

@@ -6,7 +6,7 @@ jobs:
   update-homebrew:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.TOKEN }}
           repository: epartment/homebrew-roll

.github/workflows/shellcheck.yml

@@ -0,0 +1,24 @@
+name: ShellCheck
+on:
+  push:
+    paths:
+      - 'commands/*.cmd'
+      - 'utils/*.sh'
+      - '.github/workflows/shellcheck.yml'
+  pull_request:
+    paths:
+      - 'commands/*.cmd'
+      - 'utils/*.sh'
+      - '.github/workflows/shellcheck.yml'
+  workflow_dispatch:
+
+jobs:
+  shellcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Install shellcheck
+        run: sudo apt-get update && sudo apt-get install -y shellcheck
+      - name: Run shellcheck
+        run: shellcheck commands/*.cmd utils/*.sh

.github/workflows/tag-release.yml

@@ -10,7 +10,7 @@ jobs:
   create-tag:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Update Files
         env:
           VERSION: ${{ inputs.version }}

README.md

@@ -1 +1,100 @@
-# roll-docker-stack
+# Roll Docker Stack
+
+🚀 **A powerful, flexible Docker development environment for modern web applications**
+
+Roll Docker Stack provides pre-configured Docker environments for various frameworks and CMS platforms, making it easy to spin up consistent development environments with all the tools you need.
+
+## 🌟 Features
+
+- **Multi-Framework Support**: Magento 2, Laravel, Symfony, TYPO3, Shopware, WordPress, and more
+- **Service Integration**: PHP-FPM, Nginx, MySQL/MariaDB, Redis, Elasticsearch, RabbitMQ, Varnish
+- **Developer Tools**: Xdebug, MailPit (Better Mailhog Alternative), Redis Insight, ElasticVue, and more
+- **Cross-Platform**: macOS, Linux, and Windows (WSL2) support
+- **Local Development**: Optimized for local development environments
+- **Easy Configuration**: Environment-specific settings with sensible defaults
+
+## 🚀 Installation
+
+### Installing via Homebrew (Recommended)
+
+RollDev may be installed via Homebrew on both macOS and Linux hosts:
+
+```bash
+brew install epartment/roll/roll
+roll svc up
+```
+
+**Updating via Homebrew:**
+```bash
+brew upgrade epartment/roll/roll
+roll svc restart
+```
+
+
+### Windows Installation (via WSL2)
+
+1. Install and enable WSL2 in Windows 10
+2. Install Ubuntu 20.04 or other compatible Linux version from the Windows store
+3. Launch Docker for Windows, ensure WSL2 integration is enabled
+4. Launch WSL from your terminal:
+
+```bash
+wsl
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+brew install epartment/roll/roll
+roll svc up
+```
+
+> **⚠️ Performance Warning**: For optimal performance, code should be located in the WSL Linux home path (`~/code/projectname`) NOT the default `/mnt/c` path mapping.
+
+> **💡 GUI Tools**: Windows GUI tools should use network paths: `\\wsl$\Ubuntu-20.04\home\<USER>\<PROJECTPATH>`
+
+## ⚙️ Next Steps
+
+### Automatic DNS Resolution
+
+- **Linux**: Configure DNS to resolve `*.test` to `127.0.0.1` or use `/etc/hosts` entries
+- **macOS**: Automatic via BSD per-TLD resolver at `/etc/resolver/test`
+- **Windows**: Manual configuration of network adapter DNS server required
+
+### Trusted CA Root Certificate
+
+RollDev uses a CA root certificate for trusted SSL certificates. The CA root is located at `~/.roll/ssl/rootca/certs/ca.cert.pem`.
+
+- **macOS**: Automatically added to Keychain (search for 'RollDev Proxy Local CA')
+- **Linux**: Added to system trust bundle automatically
+- **Firefox**: Import CA manually via Preferences → Privacy & Security → View Certificates → Authorities → Import
+- **Chrome (Linux)**: Import CA via Settings → Privacy And Security → Manage Certificates → Authorities → Import
+
+## 📚 Full Documentation
+
+For complete installation instructions, configuration options, troubleshooting, and advanced usage, visit our comprehensive documentation:
+
+**👉 [epartment.github.io/rolldev](https://epartment.github.io/rolldev)**
+
+## 🛠️ Supported Environments
+
+- **Magento 2** - Complete e-commerce development stack
+- **Magento 1** - Legacy Magento support
+- **Laravel** - Modern PHP framework environment
+- **Symfony** - Professional PHP development
+- **TYPO3** - Enterprise CMS platform
+- **Shopware** - E-commerce platform
+- **WordPress** - Popular CMS environment
+- **Akeneo** - PIM platform support
+- **PHP** - Generic PHP development environment
+
+## 🤝 Contributing
+
+We welcome contributions! Please see our [contribution guidelines](https://epartment.github.io/rolldev/contributing/) for details.
+
+## 📄 License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+
+## 🔗 Links
+
+- **Documentation**: [epartment.github.io/rolldev](https://epartment.github.io/rolldev)
+- **CLI Repository**: [github.com/epartment/rolldev](https://github.com/epartment/rolldev)
+- **Issues**: [github.com/epartment/rolldev/issues](https://github.com/epartment/rolldev/issues)
+- **Container Packages**: [github.com/orgs/epartment/packages](https://github.com/orgs/epartment/packages?repo_name=rolldev)

bin/roll

@@ -13,6 +13,8 @@ readonly ROLL_DIR="$(
   && pwd
 )"
 source "${ROLL_DIR}/utils/core.sh"
+source "${ROLL_DIR}/utils/config.sh"
+source "${ROLL_DIR}/utils/registry.sh"
 source "${ROLL_DIR}/utils/env.sh"
 
 ## verify docker is installed
@@ -38,45 +40,23 @@ declare ROLL_PARAMS=()
 declare ROLL_CMD_VERB=
 declare ROLL_CMD_EXEC=
 declare ROLL_CMD_HELP=
-declare ROLL_CMD_ANYARGS=(svc env db redis sync shell debug rootnotty rootshell clinotty root node npm cli copyfromcontainer copytocontainer composer grunt magento magerun)
+declare ROLL_CMD_ANYARGS=(svc env db redis sync shell debug rootnotty rootshell clinotty root node npm cli copyfromcontainer copytocontainer composer grunt magento magerun backup restore restore-full duplicate magento2-init tapsync)
 
 ## parse first argument as command and determine validity
 if (( "$#" )); then
   ## local project directory if running within one; don't fail if it can't be found
   ROLL_ENV_PATH="$(locateEnvPath 2>/dev/null)" || true
   ROLL_ENV_TYPE="$(renderEnvType 2>/dev/null)" || true
 
-	if [[ -f "${ROLL_HOME_DIR}/reclu/${1}.cmd" ]]; then
+  # Use registry system for command discovery
+  COMMAND_RESULT="$(findCommand "$1")"
+
+  if [[ "$COMMAND_RESULT" =~ ^found: ]]; then
     ROLL_CMD_VERB="$1"
-    ROLL_CMD_EXEC="${ROLL_HOME_DIR}/reclu/${1}.cmd"
-    ROLL_CMD_HELP="${ROLL_HOME_DIR}/reclu/${1}.help"
-    shift
-  elif [[ -f "${ROLL_HOME_DIR}/reclu/${ROLL_ENV_TYPE}/${1}.cmd" ]]; then
-    ROLL_CMD_VERB="$1"
-    ROLL_CMD_EXEC="${ROLL_HOME_DIR}/reclu/${ROLL_ENV_TYPE}/${1}.cmd"
-    ROLL_CMD_HELP="${ROLL_HOME_DIR}/reclu/${ROLL_ENV_TYPE}/${1}.help"
-    shift
-  elif [[ -f "${ROLL_DIR}/commands/${1}.cmd" ]]; then
-    ROLL_CMD_VERB="$1"
-    ROLL_CMD_EXEC="${ROLL_DIR}/commands/${1}.cmd"
-    ROLL_CMD_HELP="${ROLL_DIR}/commands/${1}.help"
-    shift
-  elif [[ -f "${ROLL_DIR}/commands/${ROLL_ENV_TYPE}/${1}.cmd" ]]; then
-    ROLL_CMD_VERB="$1"
-    ROLL_CMD_EXEC="${ROLL_DIR}/commands/${ROLL_ENV_TYPE}/${1}.cmd"
-    ROLL_CMD_HELP="${ROLL_DIR}/commands/${ROLL_ENV_TYPE}/${1}.help"
-    shift
-  elif [[ -f "${ROLL_ENV_PATH}/.roll/commands/${1}.cmd" ]]; then
-    ROLL_CMD_VERB="$1"
-    ROLL_CMD_ANYARGS+=("$1")
-    ROLL_CMD_EXEC="${ROLL_ENV_PATH}/.roll/commands/${1}.cmd"
-    ROLL_CMD_HELP="${ROLL_ENV_PATH}/.roll/commands/${1}.help"
-    shift
-  elif [[ -f "${ROLL_HOME_DIR}/commands/${1}.cmd" ]]; then
-    ROLL_CMD_VERB="$1"
-    ROLL_CMD_ANYARGS+=("$1")
-    ROLL_CMD_EXEC="${ROLL_HOME_DIR}/commands/${1}.cmd"
-    ROLL_CMD_HELP="${ROLL_HOME_DIR}/commands/${1}.help"
+    # Extract cmd_path and help_path from "found:cmd_path:help_path"
+    COMMAND_RESULT="${COMMAND_RESULT#found:}"
+    ROLL_CMD_EXEC="${COMMAND_RESULT%%:*}"
+    ROLL_CMD_HELP="${COMMAND_RESULT#*:}"
     shift
   else
     ROLL_HELP=1
@@ -89,6 +69,8 @@ fi
 while (( "$#" )); do
   case "$1" in
     -h|--help)
+      ## pass --help to command if it accepts any args, otherwise show roll help
+      containsElement "${ROLL_CMD_VERB}" "${ROLL_CMD_ANYARGS[@]}" && break
       ROLL_HELP=1
       break
       ;;