From d57cccfb5ee8d22cc24727b02bf49a8402df9248 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Thu, 15 Jan 2026 17:27:17 -0800 Subject: [PATCH] fix: support the setup script on selinux --- docs/quickstart.md | 12 ++++++------ on-prem/scripts/generate-compose.sh | 4 ++-- on-prem/scripts/setup.sh | 9 +-------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/docs/quickstart.md b/docs/quickstart.md index 242a1a0..5445085 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -30,7 +30,7 @@ The interactive setup wizard will guide you through configuration: This will: 1. Ask you to select a configuration profile -2. Generate the appropriate `docker-compose.yml` +2. Symlink the appropriate `docker-compose.yml` 3. Create a `.env` file with auto-generated secrets ### Option B: Manual Setup @@ -45,11 +45,11 @@ Then edit `.env` to fill in the required secrets. See [Configuration Reference]( ### Configuration Profiles -| Profile | Services Included | Use Case | -|---------|-------------------|----------| -| `full` | Redis, MongoDB, ClickHouse, RustFS | Running everything locally | -| `database` | Redis, MongoDB, ClickHouse | Using external S3-compatible storage | -| `cache` | Redis | Using external MongoDB, ClickHouse, and S3 | +| Profile | File | Services Included | Use Case | +|---------|------|-------------------|----------| +| `full` | `docker-compose.full.yml` | Redis, MongoDB, ClickHouse, RustFS | Running everything locally | +| `database` | `docker-compose.database.yml` | Redis, MongoDB, ClickHouse | Using external S3-compatible storage | +| `cache` | `docker-compose.cache.yml` | Redis | Using external MongoDB, ClickHouse, and S3 | ## Step 3: Configure Environment diff --git a/on-prem/scripts/generate-compose.sh b/on-prem/scripts/generate-compose.sh index 455dc48..0c46818 100755 --- a/on-prem/scripts/generate-compose.sh +++ b/on-prem/scripts/generate-compose.sh @@ -31,8 +31,8 @@ elif command -v docker &> /dev/null; then YQ_CMD="docker run --rm -v \"$TEMPLATES_DIR:/templates:ro\" mikefarah/yq:4" echo "Note: Using Docker with mikefarah/yq:4 image (yq not found locally)" elif command -v podman &> /dev/null; then - # Use podman with yq image - YQ_CMD="podman run --rm -v \"$TEMPLATES_DIR:/templates:ro\" mikefarah/yq:4" + # Use podman with yq image (:Z for SELinux relabeling) + YQ_CMD="podman run --rm -v \"$TEMPLATES_DIR:/templates:ro,Z\" mikefarah/yq:4" echo "Note: Using Podman with mikefarah/yq:4 image (yq not found locally)" else echo "Error: yq is required but not installed, and neither docker nor podman are available." diff --git a/on-prem/scripts/setup.sh b/on-prem/scripts/setup.sh index 7b08770..aa8623e 100755 --- a/on-prem/scripts/setup.sh +++ b/on-prem/scripts/setup.sh @@ -156,7 +156,7 @@ echo "║ Currents On-Prem Setup ║" echo "╚═══════════════════════════════════════════════════════════╝" echo -e "${NC}" -echo "This script will help you generate a docker-compose configuration" +echo "This script will help you choose a docker-compose configuration" echo "based on which services you want to run locally vs externally." echo "" @@ -236,13 +236,6 @@ case $choice in ;; esac -# Generate the compose file (unless custom already did it) -if [ "$choice" != "4" ]; then - echo "" - echo "Generating docker-compose.$PROFILE.yml..." - "$SCRIPT_DIR/generate-compose.sh" $PROFILE -fi - # Update symlink COMPOSE_FILE="docker-compose.${PROFILE}.yml" echo ""