diff --git a/compose.yaml b/compose.yaml index 05fa801..52f473b 100644 --- a/compose.yaml +++ b/compose.yaml @@ -50,7 +50,8 @@ services: - PMA_PORT=${DB_PORT:-3306} - UPLOAD_LIMIT=100M depends_on: - - mysql + mysql: + condition: service_started volumes: mysql-data: diff --git a/docker/Dockerfile b/docker/Dockerfile index 578796b..7561ae8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,7 +18,6 @@ RUN apt-get update && apt-get install -y \ COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer - COPY ./docker/php-fpm.conf /usr/local/etc/php-fpm.d/zz-docker.conf COPY ./docker/docker-entrypoint.sh /usr/local/bin/ @@ -26,6 +25,7 @@ RUN chmod +x /usr/local/bin/docker-entrypoint.sh RUN groupadd -g $GID laravel && useradd -u $UID -g $GID -m laravel USER laravel + WORKDIR /var/www EXPOSE 9000 diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 51e85fc..a5ce269 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -6,8 +6,8 @@ cd /var/www echo ">> Running in ${APP_ENV:-unknown} mode" if [ -f "artisan" ]; then - chown -R laravel:laravel /var/www/storage /var/www/bootstrap/cache - chmod -R 775 /var/www/storage /var/www/bootstrap/cache + chown -R laravel:laravel storage bootstrap/cache + chmod -R 775 storage bootstrap/cache if [ ! -d "vendor" ]; then echo ">> Installing composer dependencies..." @@ -44,6 +44,7 @@ if [ -f "artisan" ]; then if [ "$APP_ENV" = "local" ]; then echo ">> Running seeders..." php artisan db:seed --force || true + if composer show knuckleswtf/scribe > /dev/null 2>&1; then echo ">> Generating API documentation..." php artisan scribe:generate --no-interaction || echo ">> Documentation generation failed, continuing..." @@ -55,7 +56,6 @@ if [ -f "artisan" ]; then if [ "$APP_ENV" = "production" ]; then php artisan optimize fi - else echo ">> Not a Laravel project" fi