Improve startup script

Author: mattv8

.vscode/start.sh

@@ -8,6 +8,7 @@ NC='\033[0m' # No color
 env_dir=. # .env directory
 docker_dir=$env_dir # docker-compose.yml directory
 bedrock_dir=$env_dir # docker-compose.yml directory
+dockerfile_dir=dockerfile # dockerfile directory
 
 echo -e "Current directory: $(pwd)"
 
@@ -58,10 +59,17 @@ check_docker_running() {
 
 # Check if Docker Compose images need to be built
 check_docker_compose_build() {
-    if ! sudo docker compose --env-file $env_dir/.env -f $docker_dir/docker-compose.yml config --services | xargs sudo docker images | grep -q "<none>"; then
-        echo -e "Building Docker Compose images..."
-        sudo docker compose --env-file $env_dir/.env -f $docker_dir/docker-compose.yml build
-    fi
+    for dockerfile_path in "${dockerfile_dir}"/*.Dockerfile; do
+
+        # Extract service name from Dockerfile name (e.g., php-fpm from php-fpm.Dockerfile)
+        service=$(basename "$dockerfile_path" .Dockerfile)
+
+        # Check if an image for the service already exists
+        if ! sudo docker images | awk '{print $1}' | grep -q "^${service}$"; then
+            echo "Image for service '${service}' does not exist. Building now..."
+            sudo docker compose --env-file "${env_dir}/.env" -f "$docker_dir/docker-compose.yml" build "${service}"
+        fi
+    done
 }
 
 check_dot_env() {

dockerfile/php-fpm.Dockerfile dockerfile/php.Dockerfiledockerfile/php-fpm.Dockerfile renamed to dockerfile/php.Dockerfile

@@ -1,7 +1,12 @@
-FROM php:8.2-fpm
+FROM php:8.3-fpm
+
+# Update sources list to use a faster mirror if /etc/apt/sources.list exists
+RUN sed -i 's|http://deb.debian.org/debian|http://mirrors.ocf.berkeley.edu/debian|g' /etc/apt/sources.list.d/debian.sources
 
 # Install dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt update -o Acquire::http::Timeout="60"
+
+RUN apt install -y \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
     libpng-dev \
@@ -16,7 +21,8 @@ RUN apt-get update && apt-get install -y \
     less \
     mariadb-client \
     sudo \
-    curl
+    curl && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install PHP extensions
 RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
@@ -33,5 +39,13 @@ RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli
 # Verify WP-CLI installation
 RUN wp --info
 
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer -o composer-setup.php \
+    && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \
+    && rm composer-setup.php
+
+# Verify Composer installation
+RUN composer --version
+
 # Clean up
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*