Merge pull request #66 from abordage/feature/workspace-terminal-width-limit

feat(workspace): add terminal width configuration support

Author: abordage

.env.example

@@ -30,6 +30,13 @@ ENABLE_SERVICES="nginx php-fpm workspace postgres mysql redis rabbitmq elasticse
 #
 DEPENDENCY_PHP_EXTENSIONS="amqp apcu ast bcmath bz2 decimal exif gd gmp imagick intl pcov pcntl pdo_mysql pdo_pgsql pgsql redis soap sockets xdebug xlswriter xsl yaml zip"
 
+# =============================================================================
+# Build Configuration
+# =============================================================================
+# Debian mirror for faster package downloads (leave empty for default)
+# Examples: http://ftp.lt.debian.org/debian, http://ftp.no.debian.org/debian
+DEBIAN_MIRROR=
+
 # =============================================================================
 # Port Configuration
 # =============================================================================
@@ -91,6 +98,9 @@ HEALTH_CHECK_RETRIES=3
 # =============================================================================
 NODE_VERSION=22
 
+# Terminal width limit in columns (default: 120, set to 0 to disable)
+TERMINAL_MAX_COLUMNS=120
+
 # =============================================================================
 # NGINX Configuration
 # =============================================================================

Makefile

@@ -89,10 +89,23 @@ restart: ## Restart selected services with network aliases
 	@$(call show_aliases_status)
 	@$(DOCKER_COMPOSE) $(COMPOSE_FILES) restart $(shell echo $(ENABLE_SERVICES))
 
-rebuild: ## [DEPRECATED] Use 'make update' instead
-	@echo "$(YELLOW)Please use 'make update' instead$(NC)"
-	@echo ""
-	@$(MAKE) update
+rebuild: ## Rebuild workspace and php-fpm images and restart services
+	@echo "$(BLUE)Rebuilding workspace and php-fpm images...$(NC)"
+	@echo "$(YELLOW)Step 1: Stopping containers...$(NC)"
+	@$(DOCKER_COMPOSE) $(COMPOSE_FILES) stop workspace php-fpm
+	@echo "$(YELLOW)Step 2: Removing containers...$(NC)"
+	@$(DOCKER_COMPOSE) $(COMPOSE_FILES) rm -f workspace php-fpm
+	@echo "$(YELLOW)Step 3: Removing existing images...$(NC)"
+	@PROJECT_NAME=$$(grep '^PROJECT_NAME=' $(ENV_FILE) | cut -d'=' -f2) && \
+	PROJECT_SUFFIX=$$(grep '^PROJECT_SUFFIX=' $(ENV_FILE) | cut -d'=' -f2) && \
+	COMPOSE_PROJECT_NAME="$$PROJECT_NAME-$$PROJECT_SUFFIX" && \
+	docker rmi "$$COMPOSE_PROJECT_NAME-workspace:latest" 2>/dev/null || echo "$(GREEN)No workspace image to remove$(NC)" && \
+	docker rmi "$$COMPOSE_PROJECT_NAME-php-fpm:latest" 2>/dev/null || echo "$(GREEN)No php-fpm image to remove$(NC)"
+	@echo "$(YELLOW)Step 4: Building images with no cache...$(NC)"
+	@$(DOCKER_COMPOSE) $(COMPOSE_FILES) build --no-cache workspace php-fpm
+	@echo "$(YELLOW)Step 5: Starting services...$(NC)"
+	@$(MAKE) start
+	@echo "$(GREEN)✓ Rebuild completed successfully!$(NC)"
 
 update: ## Update DockerKit, reinstall dk command, and rebuild containers (with cache)
 	@tools/update.sh

docker-compose.yml

@@ -17,6 +17,8 @@ services:
         - NODE_VERSION
         # PostgreSQL
         - POSTGRES_VERSION
+        # Build configuration
+        - DEBIAN_MIRROR
     restart: on-failure:3
     depends_on:
       postgres:
@@ -34,6 +36,8 @@ services:
     environment:
       - CHOKIDAR_USEPOLLING=true
       - TZ
+      # Terminal configuration
+      - TERMINAL_MAX_COLUMNS
       # Container user configuration
       - APP_USER
       - APP_UID
@@ -91,6 +95,8 @@ services:
         - APP_GID
         # PHP Extensions
         - DEPENDENCY_PHP_EXTENSIONS
+        # Build configuration
+        - DEBIAN_MIRROR
     restart: on-failure:3
     extra_hosts:
       - "host.docker.internal:host-gateway"
@@ -291,6 +297,7 @@ services:
 
       # Development optimizations
       - action.auto_create_index=true
+      - action.destructive_requires_name=false
       - bootstrap.memory_lock=false
       - cluster.routing.allocation.disk.threshold_enabled=false
       - cluster.routing.allocation.node_concurrent_recoveries=2

php-fpm/Dockerfile

@@ -13,6 +13,9 @@ ARG DEPENDENCY_PHP_EXTENSIONS
 # cURL Configuration
 ARG CURL_VERSION=curl-8_16_0
 
+# Debian Mirror Configuration
+ARG DEBIAN_MIRROR=
+
 FROM php:${PHP_VERSION}-fpm AS base
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -58,11 +61,23 @@ RUN groupadd -g "${APP_GID}" "${APP_USER}" && \
 # ============================================================================
 FROM base AS dependencies
 
+ARG DEBIAN_MIRROR=
+
 USER root
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install minimal system tools for PHP-FPM operation
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    set -eux; \
+    # Configure Debian mirror \
+    MIRROR="${DEBIAN_MIRROR:-http://deb.debian.org/debian}" && \
+    if [ "${MIRROR}" != "http://deb.debian.org/debian" ]; then \
+        echo "Configuring Debian mirror: ${MIRROR}"; \
+        [ -f /etc/apt/sources.list.d/debian.sources ] && sed -i "s|http://deb.debian.org/debian|${MIRROR}|g" /etc/apt/sources.list.d/debian.sources; \
+        [ -f /etc/apt/sources.list ] && sed -i "s|http://deb.debian.org/debian|${MIRROR}|g" /etc/apt/sources.list; \
+        echo "Debian mirror configured successfully"; \
+    fi && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
     build-essential \

workspace/Dockerfile

@@ -22,6 +22,9 @@ ARG CURL_VERSION=curl-8_16_0
 # Xdebug Configuration
 ARG PHP_XDEBUG_CLIENT_PORT=9003
 
+# Debian Mirror Configuration
+ARG DEBIAN_MIRROR=
+
 FROM php:${PHP_VERSION}-cli AS base
 
 # Import ARG values into this stage
@@ -59,6 +62,7 @@ RUN groupadd -g "${APP_GID}" "${APP_USER}" && \
 FROM base AS dependencies
 
 ARG POSTGRES_VERSION=17
+ARG DEBIAN_MIRROR=
 
 USER root
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -67,6 +71,14 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     set -eux; \
+    # Configure Debian mirror \
+    MIRROR="${DEBIAN_MIRROR:-http://deb.debian.org/debian}" && \
+    if [ "${MIRROR}" != "http://deb.debian.org/debian" ]; then \
+        echo "Configuring Debian mirror: ${MIRROR}"; \
+        [ -f /etc/apt/sources.list.d/debian.sources ] && sed -i "s|http://deb.debian.org/debian|${MIRROR}|g" /etc/apt/sources.list.d/debian.sources; \
+        [ -f /etc/apt/sources.list ] && sed -i "s|http://deb.debian.org/debian|${MIRROR}|g" /etc/apt/sources.list; \
+        echo "Debian mirror configured successfully"; \
+    fi && \
     apt-get update && \
     apt-get install -y --no-install-recommends \
     bash-completion \
@@ -106,7 +118,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     set -eux; \
     # Add Debian Backports repository \
-    echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list && \
+    MIRROR="${DEBIAN_MIRROR:-http://deb.debian.org/debian}" && \
+    echo "deb ${MIRROR} bookworm-backports main" > /etc/apt/sources.list.d/backports.list && \
     apt-get update && \
     # Install latest versions from backports \
     apt-get install -y --no-install-recommends -t bookworm-backports \

workspace/shell/.bashrc

@@ -21,6 +21,15 @@ shopt -s checkwinsize
 # Save history immediately after each command (prevents loss on container restart)
 PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND$'\n'}history -a"
 
+# Terminal width configuration
+TERMINAL_MAX_COLUMNS=${TERMINAL_MAX_COLUMNS:-120}
+
+# Cap terminal width before each command for better output formatting
+_cap_columns() {
+    [[ $COLUMNS -gt $TERMINAL_MAX_COLUMNS ]] && export COLUMNS=$TERMINAL_MAX_COLUMNS
+}
+PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND$'\n'}_cap_columns"
+
 # Enable bash completion
 if ! shopt -oq posix; then
     if [ -f /usr/share/bash-completion/bash_completion ]; then
@@ -62,7 +71,7 @@ fi
 if [[ $- == *i* ]] && [[ -t 1 ]] && command -v resize >/dev/null 2>&1; then
     # Initial resize on shell start
     eval "$(resize 2>/dev/null)"
-    
+
     # Auto-update on terminal window resize
     trap 'eval "$(resize 2>/dev/null)"' WINCH
 fi