From e5d59eac02d98cd7c0e15faa4ecee8c1c41786f5 Mon Sep 17 00:00:00 2001
From: Fimeg <casey.tunturi@gmail.com>
Date: Fri, 31 Oct 2025 07:41:00 -0400
Subject: [PATCH] fix deployment workflow - manual bootstrap copy and restart

---
 .gitignore         |  6 ++++++
 README.md          | 13 ++++++++-----
 docker-compose.yml |  8 ++------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1cd76c8..e1c3f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,6 +129,12 @@ web_modules/
 .env.production.local
 .env.local
 
+# Config folder - keep only bootstrap example
+config/.env
+
+# Test files
+test-agent
+
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 .parcel-cache
diff --git a/README.md b/README.md
index 39a7784..3f78fd1 100644
--- a/README.md
+++ b/README.md
@@ -65,19 +65,22 @@ RedFlag lets you manage software updates across all your servers from one dashbo
 ### Server Deployment (Docker)
 
 ```bash
-# Clone and start
+# Clone and configure
 git clone https://github.com/Fimeg/RedFlag.git
 cd RedFlag
+cp config/.env.bootstrap.example config/.env
+docker-compose build
 docker-compose up -d
 
-# Access web UI
+# Access web UI and run setup
 open http://localhost:3000
+# Follow setup wizard, then copy generated .env content
 
-# Follow setup wizard to create admin account
+# Restart with new configuration
+docker-compose down
+docker-compose up -d
 ```
 
-The setup wizard runs automatically on first launch. It'll generate secure secrets and walk you through creating an admin account.
-
 ---
 
 ### Agent Installation
diff --git a/docker-compose.yml b/docker-compose.yml
index 6526d54..30f9282 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,6 @@ services:
       POSTGRES_INITDB_ARGS: "--encoding=UTF-8 --lc-collate=C --lc-ctype=C"
     volumes:
       - postgres-data:/var/lib/postgresql/data
-      - ./config/.env:/shared/.env
     ports:
       - "5432:5432"
     healthcheck:
@@ -19,8 +18,7 @@ services:
       retries: 5
     restart: unless-stopped
     env_file:
-      - ./config/.env.bootstrap.example
-      - ./config/.env
+      - ${ENV_FILE:-./config/.env}
 
   server:
     build:
@@ -30,7 +28,6 @@ services:
     volumes:
       - server-config:/app/config
       - server-data:/app/data
-      - ./config/.env:/shared/.env
     depends_on:
       postgres:
         condition: service_healthy
@@ -39,8 +36,7 @@ services:
     command: ["./redflag-server"]
     restart: unless-stopped
     env_file:
-      - ./config/.env.bootstrap.example
-      - ./config/.env
+      - ${ENV_FILE:-./config/.env}
 
   web:
     build: