feat(docker): refactor to use pre-built images

- Add build/load script for image management
- Use .env config for image naming and PHP version
- Switch to www-data user in Dockerfile
- Update compose.yaml to use pre-built images
- Add .dockerignore
- Simplify entrypoint script

.dockerignore

@@ -0,0 +1,3 @@
+*
+!docker/docker-entrypoint.sh
+!docker/php-fpm.conf

.env.example

@@ -0,0 +1,15 @@
+DB_CONNECTION=mysql
+DB_HOST=mysql
+DB_PORT=3306
+DB_DATABASE=app
+DB_USERNAME=laravel
+DB_PASSWORD=secret
+DB_ROOT_PASSWORD=secret
+
+# Docker
+PHP_VERSION=8.3-fpm
+IMAGE_NAME=dev-pj1-laravel
+IMAGE_TAG=${PHP_VERSION}
+
+APP_UID=1000
+APP_GID=1000

README.md

@@ -5,7 +5,9 @@
 ## Создание проекта:
 
 ```bash
-touch .env
+cp .env.example .env
+# !change .env for yourself
+./run.sh build
 docker compose up -d php-fpm
 docker compose exec php-fpm bash
 ```
@@ -20,15 +22,3 @@ laravel new example-app
 mv example-app/* example-app/.* ./
 rmdir example-app
 ```
-
-Изменить в `.env`
-
-```
-DB_CONNECTION=mysql
-DB_HOST=mysql
-DB_PORT=3306
-DB_DATABASE=app
-DB_USERNAME=laravel
-DB_PASSWORD=secret
-DB_ROOT_PASSWORD=secret
-```

compose.yaml

@@ -13,17 +13,12 @@ services:
         condition: service_started
 
   php-fpm:
-    build:
+    image: "${IMAGE_NAME}:${IMAGE_TAG}"
-      context: .
+    user: "${APP_UID}:${APP_GID}"
-      dockerfile: ./docker/Dockerfile
-      args:
-        UID: ${UID:-1000}
-        GID: ${GID:-1000}
     env_file:
       - .env
     volumes:
       - ./:/var/www
-      - ./docker/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh
     depends_on:
       mysql:
         condition: service_started

docker/Dockerfile

@@ -1,31 +1,21 @@
-FROM php:8.3-fpm
+ARG PHP_VERSION=8.3-fpm
+FROM php:${PHP_VERSION}
 
-ARG UID
+RUN apt-get update && apt-get install -y --no-install-recommends \
-ARG GID
+    libpng-dev libonig-dev libxml2-dev libzip-dev \
-
+    zip unzip git \
-RUN apt-get update && apt-get install -y \
     netcat-traditional \
-    libpng-dev \
-    libonig-dev \
-    libxml2-dev \
-    libzip-dev \
-    zip \
-    unzip \
-    git \
 && docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath gd zip \
 && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
-
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+COPY --chown=www-data:www-data ./docker/docker-entrypoint.sh /usr/local/bin/
 COPY ./docker/php-fpm.conf /usr/local/etc/php-fpm.d/zz-docker.conf
 
-COPY ./docker/docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
-RUN groupadd -g $GID laravel && useradd -u $UID -g $GID -m laravel
+USER www-data
-USER laravel
-
 WORKDIR /var/www
 
 EXPOSE 9000

docker/docker-entrypoint.sh

@@ -1,35 +1,26 @@
 #!/bin/sh
 set -e
 
-cd /var/www
+APP_ENV=${APP_ENV:-unknown}
-
+echo ">> Running in $APP_ENV mode"
-echo ">> Running in ${APP_ENV:-unknown} mode"
 
+# Only for Laravel project
 if [ -f "artisan" ]; then
-  chown -R laravel:laravel storage bootstrap/cache
-  chmod -R 775 storage bootstrap/cache
 
-  if [ ! -d "vendor" ]; then
+  echo ">> Ensuring composer dependencies are up to date..."
-    echo ">> Installing composer dependencies..."
+  if [ "$APP_ENV" = "production" ]; then
-    if [ "$APP_ENV" = "production" ]; then
+    composer install --no-dev --optimize-autoloader
-      composer install --no-dev --optimize-autoloader
-    else
-      composer install --optimize-autoloader
-    fi
   else
-    echo ">> Vendor directory exists, skipping installation"
+    composer install --optimize-autoloader
   fi
 
   if [ -f ".env" ] && grep -q '^APP_KEY=$' .env; then
-    echo ">> APP_KEY is missing. Generating application key..."
+    echo ">> Generating application key..."
     php artisan key:generate --ansi
   fi
 
-  echo ">> Waiting for MySQL to be ready..."
+  echo ">> Waiting for MySQL..."
-  while ! nc -z mysql 3306; do
+  while ! nc -z mysql 3306; do sleep 1; done
-    sleep 1
-  done
-  echo ">> MySQL is ready!"
 
   echo ">> Running migrations..."
   php artisan migrate --force || true
@@ -37,8 +28,6 @@ if [ -f "artisan" ]; then
   if [ ! -L "public/storage" ] && [ -d "storage/app/public" ]; then
     echo ">> Creating storage link..."
     php artisan storage:link
-  else
-    echo ">> Storage link already exists or storage directory missing"
   fi
 
   if [ "$APP_ENV" = "local" ]; then

docker/php-fpm.conf

@@ -2,8 +2,6 @@
 daemonize = no
 
 [www]
-user = laravel
-group = laravel
 listen = 9000
 pm = dynamic
 pm.max_children = 5

run.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+set -euo pipefail
+
+# Help
+if [[ $# -eq 0 ]]; then
+    echo "Usage: $0 {build|load} [source]"
+    echo "  build               - Build image and save archive"
+    echo "  load [source]       - Load image from:"
+    echo "                         (no arg)  - Use archive or build from source"
+    echo "                         URL       - download from URL then load"
+    echo "                         file      - load from specified file via docker load command"
+    echo ""
+    echo "Archive location: \${IMAGE_NAME}_\$IMAGE_TAG.tar.gz in current directory"
+    exit 0
+fi
+
+# Load config
+[[ ! -f .env ]] && cp .env.example .env
+source .env
+
+# Validate
+if [[ -z "${IMAGE_NAME:-}" ]] || [[ -z "${IMAGE_TAG:-}" ]] || [[ -z "${PHP_VERSION:-}" ]]; then
+    echo "Error: IMAGE_NAME or IMAGE_TAG or PHP_VERSION not set in .env"
+    echo "Please add to .env (check vars in .env.example):"
+    echo "PHP_VERSION=8.3-fpm  # Used in Dockerfile"
+    echo "IMAGE_NAME=your-image-name"
+    echo "IMAGE_TAG=\${PHP_VERSION}  # Or custom tag"
+    exit 1
+fi
+
+IMAGE="$IMAGE_NAME:$IMAGE_TAG"
+TAR_FILE="${IMAGE_NAME}_$IMAGE_TAG.tar.gz"
+
+ACTION="${1:-}"
+SOURCE="${2:-}"
+
+case "$ACTION" in
+  build)
+    docker build -f docker/Dockerfile --build-arg PHP_VERSION=$PHP_VERSION -t "$IMAGE" .
+    docker save "$IMAGE" | gzip > "$TAR_FILE"
+    ;;
+  load)
+    if [[ -f "$TAR_FILE" ]]; then
+      docker load < "$TAR_FILE"
+    elif [[ -n "$SOURCE" ]]; then
+      if [[ "$SOURCE" =~ ^https?:// ]]; then
+        curl -L "$SOURCE" -o "$TAR_FILE"
+        docker load < "$TAR_FILE"
+      else
+        # Handle local file path
+        docker load < "$SOURCE"
+      fi
+    else
+      docker build -f docker/Dockerfile --build-arg PHP_VERSION=$PHP_VERSION -t "$IMAGE" .
+    fi
+    ;;
+  *)
+    echo "Error: Unknown action '$ACTION'"
+    echo "Usage: $0 {build|load} [source]"
+    exit 1
+    ;;
+esac