Merge branch 'main' of https://github.com/kri2tle/Hardhat-Enterprises-website

Author: kri2tle

Dockerfile

@@ -7,21 +7,37 @@ ENV PYTHONUNBUFFERED 1
 # Set work directory
 WORKDIR /app
 
-# Install system dependencies
+# Install system dependencies including development tools
 RUN apt-get update && apt-get install -y --no-install-recommends \
     build-essential \
+    curl \
+    vim \
+    git \
+    postgresql-client \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Python dependencies
 COPY requirements.txt .
 RUN pip install --upgrade pip
 RUN pip install --no-cache-dir -r requirements.txt
 
-# Copy project
-COPY . .
+# Install additional development dependencies
+RUN pip install --no-cache-dir \
+    ipython \
+    ipdb \
+    django-debug-toolbar \
+    django-extensions
 
-# Create necessary directories
+# Create necessary directories first
 RUN mkdir -p /app/static /app/media
 
-# Run gunicorn
-CMD ["gunicorn", "--bind", "0.0.0.0:8000", "core.wsgi"]
+# Database population is handled by Django management command in docker-compose
+
+# Copy project (this will be overridden by volume mount in development)
+COPY . .
+
+# Ensure .env file exists for SECRET_KEY persistence
+RUN touch /app/.env
+
+# Development command - will be overridden by docker-compose
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000", "--insecure"] 

Dockerfile.prod

@@ -0,0 +1,27 @@
+FROM python:3.9
+
+# set environment variables
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
+# Set work directory
+WORKDIR /app
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Python dependencies
+COPY requirements.txt .
+RUN pip install --upgrade pip
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy project
+COPY . .
+
+# Create necessary directories
+RUN mkdir -p /app/static /app/media
+
+# Run gunicorn
+CMD ["gunicorn", "--bind", "0.0.0.0:8000", "core.wsgi"]

Scripts/Auto-Setup.sh

@@ -3,8 +3,11 @@
 APP_NAME="Hardhat Enterprises Web App"
 ENV_FILE=".env"
 ENV_SAMPLE_FILE="env.sample"
+
+# Default to development mode
+MODE="dev"
 COMPOSE_FILE="docker-compose.yml"
-HEALTHCHECK_URL="http://localhost:80/health"
+HEALTHCHECK_URLS=("http://localhost:8000" "http://127.0.0.1:8000")
 
 GREEN="\033[0;32m"
 RED="\033[0;31m"
@@ -15,16 +18,43 @@ show_help() {
   echo "Usage: $0 [OPTION]"
   echo
   echo "  --dry-run     Only perform environment checks"
-  echo "  --setup       Run checks and start dockerized app"
+  echo "  --dev         Run checks and start development environment (default)"
+  echo "  --prod        Run checks and start production environment"
+  echo "  --setup       Run checks and start dockerized app (legacy - uses dev mode)"
   echo "  --help        Show this help message"
+  echo
+  echo "Development mode (--dev):"
+  echo "  - Uses docker-compose.yml"
+  echo "  - Django dev server on port 8000"
+  echo "  - Nginx proxy on port 8080"
+  echo "  - PostgreSQL on port 5433"
+  echo "  - Health checks: http://localhost:8000, http://127.0.0.1:8000"
+  echo
+  echo "Production mode (--prod):"
+  echo "  - Uses docker-compose-prod.yml"
+  echo "  - Gunicorn server behind Nginx on port 80"
+  echo "  - PostgreSQL on port 5432"
+  echo "  - Health check: http://localhost"
 }
 
 TICK="${GREEN}Passed${NC}"
 CROSS="${RED}Failed${NC}"
 
+set_mode_config() {
+  if [ "$MODE" = "prod" ]; then
+    COMPOSE_FILE="docker-compose-prod.yml"
+    HEALTHCHECK_URLS=("http://localhost")
+    echo -e "${YELLOW}Production mode selected${NC}"
+  else
+    COMPOSE_FILE="docker-compose.yml"
+    HEALTHCHECK_URLS=("http://localhost:8000" "http://127.0.0.1:8000")
+    echo -e "${YELLOW}Development mode selected${NC}"
+  fi
+}
+
 show_table_header() {
   echo -e "\n======================================================"
-  echo -e "${YELLOW}  Running checks for \"$APP_NAME\"${NC}"
+  echo -e "${YELLOW}  Running checks for \"$APP_NAME\" ($MODE mode)${NC}"
   echo -e "======================================================\n"
 }
 
@@ -58,13 +88,24 @@ check_file() {
 }
 
 check_health() {
-  if curl -s --head --request GET "$HEALTHCHECK_URL" | grep "200 OK" >/dev/null; then
-    echo -e "Healthcheck endpoint ($HEALTHCHECK_URL) : $TICK"
-    return 0
-  else
-    echo -e "Healthcheck endpoint ($HEALTHCHECK_URL) : $CROSS"
+  local health_found=false
+  local active_url=""
+  
+  for url in "${HEALTHCHECK_URLS[@]}"; do
+    if curl -s --head --request GET "$url" | grep "200 OK" >/dev/null; then
+      echo -e "Health endpoint ($url) : $TICK"
+      health_found=true
+      active_url="$url"
+      break
+    fi
+  done
+  
+  if [ "$health_found" = false ]; then
+    echo -e "Health endpoints (${HEALTHCHECK_URLS[*]}) : $CROSS"
     return 1
   fi
+  
+  return 0
 }
 
 run_checks() {
@@ -79,33 +120,78 @@ run_checks() {
 
   check_file "$ENV_SAMPLE_FILE" "env.sample present"
   check_file "$ENV_FILE" ".env present"
-  check_file "$COMPOSE_FILE" "docker-compose.yml present"
+  
+  if [ "$MODE" = "prod" ]; then
+    check_file "$COMPOSE_FILE" "docker-compose-prod.yml present"
+  else
+    check_file "$COMPOSE_FILE" "docker-compose.yml present"
+  fi
 
   check_health
 }
 
 run_setup() {
-  echo -e "\n ${YELLOW}Starting Docker containers...\n${NC}"
-  docker-compose up --build -d
+  echo -e "\n ${YELLOW}Starting Docker containers ($MODE mode)...\n${NC}"
+  
+  if [ "$MODE" = "prod" ]; then
+    docker-compose -f docker-compose-prod.yml up --build -d
+  else
+    docker-compose up --build -d
+  fi
 
   echo -e "\n ${YELLOW}Waiting for health endpoint...${NC}"
-  sleep 5
+  sleep 10
 
   if check_health; then
-    echo -e "\n${GREEN}Setup complete. Visit your app at http://localhost:80/health\n"
+    if [ "$MODE" = "prod" ]; then
+      echo -e "\n${GREEN}✅ Production setup complete!${NC}"
+      echo -e "${GREEN}🌐 Application available at: http://localhost${NC}"
+      echo -e "${GREEN}📊 Health check: http://localhost${NC}\n"
+    else
+      echo -e "\n${GREEN}✅ Development setup complete!${NC}"
+      echo -e "${GREEN}🌐 Django app: http://localhost:8000 or http://127.0.0.1:8000${NC}"
+      echo -e "${GREEN}🌐 Nginx proxy: http://localhost:8080${NC}"
+      echo -e "${GREEN}📊 Health checks: http://localhost:8000, http://127.0.0.1:8000${NC}\n"
+    fi
   else
-    echo -e "\n${RED}Setup ran but app is not healthy. Please check logs using 'docker-compose logs'.${NC}\n"
+    echo -e "\n${RED}❌ Setup ran but app is not healthy.${NC}"
+    if [ "$MODE" = "prod" ]; then
+      echo -e "${RED}Please check logs using 'docker-compose -f docker-compose-prod.yml logs'.${NC}\n"
+    else
+      echo -e "${RED}Please check logs using 'docker-compose logs'.${NC}\n"
+    fi
   fi
 }
 
+# Parse arguments
 case "$1" in
-  --dry-run)
+  --prod)
+    MODE="prod"
+    set_mode_config
+    run_checks
+    run_setup
+    ;;
+  --dev)
+    MODE="dev" 
+    set_mode_config
     run_checks
+    run_setup
     ;;
   --setup)
+    # Legacy option - defaults to dev mode
+    MODE="dev"
+    set_mode_config
     run_checks
     run_setup
     ;;
+  --dry-run)
+    # Use default mode for dry run, but allow override with second argument
+    if [ "$2" = "--prod" ]; then
+      MODE="prod"
+    fi
+    set_mode_config
+    run_checks
+    ;;
   --help | *)
     show_help
     ;;

Scripts/README.md

@@ -16,17 +16,26 @@ The Hardhat Enterprises Web App's environment setup and verification are automat
 ### Commands and Usage
 
 - **`--dry-run`**
-  - Performs the checks related to enviornment without even starting the application.
-  - Check and Verify the presence of `Git`, `Python 3`, `pip3`, `Docker`, `Docker Compose` (i.e. `.env`,`docker-compose.yaml` etc)
-  - Checks the health endpoint located at `http://localhost:80/health`.
-  - **Example**: `./Auto-setup.sh --dry-run`
+  - Performs environment checks without starting the application.
+  - Checks presence of `Git`, `Python 3`, `pip3`, `Docker`, `Docker Compose`, `.env`, and compose files.
+  - Tests health endpoints based on selected mode.
+  - **Example**: `./Auto-Setup.sh --dry-run` (development mode)
+  - **Example**: `./Auto-Setup.sh --dry-run --prod` (production mode)
+- **`--dev`**
+  - Runs checks and starts development environment (default mode).
+  - Uses `docker-compose.yml` with Django dev server on port 8000 and Nginx on port 8080.
+  - Includes development tools, debugging capabilities, and auto-population of test data.
+  - **Example**: `./Auto-Setup.sh --dev`
+- **`--prod`**
+  - Runs checks and starts production environment.
+  - Uses `docker-compose-prod.yml` with Gunicorn server behind Nginx on port 80.
+  - Optimised for performance with production-grade configuration.
+  - **Example**: `./Auto-Setup.sh --prod`
 - **`--setup`**
-  - Uses `docker-compose up --build -d` to launch the Docker containers and performs all environment checks.
-  - Awaits confirmation from the health endpoint that the application is operating properly.
-  - Feedback on setup success or failure is given, along with recommendations for log checks if necessary.
+  - Legacy command that defaults to development mode for backwards compatibility.
   - **Example**: `./Auto-Setup.sh --setup`
 - **`--help`**
-  -  Displays a help message with the instructions and options available.
+  - Displays help message with all available options and mode descriptions.
   - **Example**: `./Auto-Setup.sh --help`
 
 ## precommit.sh
@@ -83,10 +92,13 @@ The `secrets-scan.sh` script incorporates TruffleHog to detect secrets within fi
   - **Example**: `./secrets-scan.sh`
 
 ## harden_docker_script.sh
-The `harden_docker_script.sh` script evaluates Docker settings for security compliance, verifying adherence to best practices like minimal base images, non-root users, and appropriate cleanup procedures.
+The `harden_docker_script.sh` script evaluates Docker settings for security compliance, verifying adherence to best practices like minimal base images, non-root users, and appropriate cleanup procedures.
 
 - **`compliance`** 
-  - Checks `Dockerfile`, `.dockerignore`, and `docker-compose.yml` for security compliance.                                                           - Validates the use of minimal base images (`python:3.12-slim`, `nginx:alpine`), non-root user configurations, dependency cleanup, and read-only >  - Generates a compliance report with pass/fail results for each check.
+  - Checks `Dockerfile`, `Dockerfile.prod`, `.dockerignore`, `docker-compose.yml`, and `docker-compose-prod.yml` for security compliance.
+  - Validates development and production configurations separately.
+  - Ensures proper environment separation between dev and prod modes.
+  - Generates a compliance report with pass/fail results for each check.
   - **Example**: `./harden_docker_script.sh compliance`
 - **`compliance --images`**
   - Expands the `complianc` directive to encompass the examination of constructed Docker images (`django_app` and `nginx`).