bugfixes
This commit is contained in:
Ahmed Darrazi
parent
6063568fcd
commit
e102b4ef16
@ -84,14 +84,11 @@ COPY docker/supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
|||||||
# Copy application code
|
# Copy application code
|
||||||
COPY --chown=www-data:www-data . .
|
COPY --chown=www-data:www-data . .
|
||||||
|
|
||||||
# Remove conflicting file causing PSR-4 autoloading errors
|
|
||||||
RUN rm -f Modules/Exam/app/Services/Exam-ResourceService.php
|
|
||||||
|
|
||||||
# Copy built assets from node stage
|
# Copy built assets from node stage
|
||||||
COPY --from=node-builder --chown=www-data:www-data /app/public/build ./public/build
|
COPY --from=node-builder --chown=www-data:www-data /app/public/build ./public/build
|
||||||
|
|
||||||
# Copy environment file from docker.env to .env if .env doesn't exist
|
# Copy environment file from docker.env to .env if .env doesn't exist
|
||||||
# RUN if [ ! -f .env ]; then cp docker.env .env; fi
|
RUN if [ ! -f .env ]; then cp docker.env .env; fi
|
||||||
|
|
||||||
# Generate APP_KEY if not present (required for some Composer operations)
|
# Generate APP_KEY if not present (required for some Composer operations)
|
||||||
RUN if ! grep -q "APP_KEY=base64:" .env; then \
|
RUN if ! grep -q "APP_KEY=base64:" .env; then \
|
||||||
@ -159,4 +156,4 @@ HEALTHCHECK --interval=60s --timeout=10s --start-period=30s --retries=5 \
|
|||||||
CMD curl -f http://localhost:80/health || curl -f http://localhost:80/test.php || exit 1
|
CMD curl -f http://localhost:80/health || curl -f http://localhost:80/test.php || exit 1
|
||||||
|
|
||||||
# Start supervisor
|
# Start supervisor
|
||||||
CMD ["sh", "-c", "mkdir -p storage/framework/cache storage/framework/sessions storage/framework/views storage/logs bootstrap/cache storage/app && touch storage/installed storage/app/installed public/installed && chown -R www-data:www-data storage bootstrap/cache public/installed && chmod -R 775 storage bootstrap/cache && if [ -f .env ]; then chmod 666 .env || true; fi && php artisan migrate --force && php artisan optimize:clear && /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf"]
|
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
|
||||||
|
|||||||
162
Dockerfile.old
Normal file
162
Dockerfile.old
Normal file
@ -0,0 +1,162 @@
|
|||||||
|
# Multi-stage Dockerfile for Laravel Mentor LMS
|
||||||
|
FROM node:22-alpine AS node-builder
|
||||||
|
|
||||||
|
# Set working directory
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Copy package files
|
||||||
|
COPY package*.json ./
|
||||||
|
|
||||||
|
# Install Node dependencies (including dev dependencies for build)
|
||||||
|
RUN npm ci
|
||||||
|
|
||||||
|
# Copy all source files for build (Vite may need access to various files)
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Build assets
|
||||||
|
RUN npm run build
|
||||||
|
|
||||||
|
# PHP Stage
|
||||||
|
FROM php:8.3-fpm-alpine AS php-base
|
||||||
|
|
||||||
|
# Install system dependencies
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
bash \
|
||||||
|
curl \
|
||||||
|
freetype-dev \
|
||||||
|
g++ \
|
||||||
|
gcc \
|
||||||
|
git \
|
||||||
|
icu-dev \
|
||||||
|
jpeg-dev \
|
||||||
|
libpng-dev \
|
||||||
|
libzip-dev \
|
||||||
|
make \
|
||||||
|
mysql-client \
|
||||||
|
nginx \
|
||||||
|
oniguruma-dev \
|
||||||
|
redis \
|
||||||
|
supervisor \
|
||||||
|
unzip \
|
||||||
|
zip \
|
||||||
|
autoconf \
|
||||||
|
pkgconf \
|
||||||
|
linux-headers \
|
||||||
|
openssl \
|
||||||
|
ca-certificates
|
||||||
|
|
||||||
|
# Install PHP extensions
|
||||||
|
RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
|
||||||
|
&& docker-php-ext-install -j$(nproc) \
|
||||||
|
bcmath \
|
||||||
|
exif \
|
||||||
|
gd \
|
||||||
|
intl \
|
||||||
|
mbstring \
|
||||||
|
opcache \
|
||||||
|
pcntl \
|
||||||
|
pdo \
|
||||||
|
pdo_mysql \
|
||||||
|
zip
|
||||||
|
|
||||||
|
# Install Redis extension with proper configuration
|
||||||
|
RUN pecl config-set php_ini /usr/local/etc/php/php.ini \
|
||||||
|
&& pecl install redis \
|
||||||
|
&& docker-php-ext-enable redis
|
||||||
|
|
||||||
|
# Install Composer
|
||||||
|
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
|
||||||
|
|
||||||
|
# Set working directory
|
||||||
|
WORKDIR /var/www/html
|
||||||
|
|
||||||
|
# Copy PHP configuration
|
||||||
|
COPY docker/php/php.ini /usr/local/etc/php/conf.d/99-custom.ini
|
||||||
|
COPY docker/php/php-fpm.conf /usr/local/etc/php-fpm.d/www.conf
|
||||||
|
|
||||||
|
# Copy Nginx configuration
|
||||||
|
COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
|
||||||
|
COPY docker/nginx/default.conf /etc/nginx/http.d/default.conf
|
||||||
|
|
||||||
|
# Copy Supervisor configuration
|
||||||
|
COPY docker/supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
||||||
|
|
||||||
|
# Copy application code
|
||||||
|
COPY --chown=www-data:www-data . .
|
||||||
|
|
||||||
|
# Remove conflicting file causing PSR-4 autoloading errors
|
||||||
|
RUN rm -f Modules/Exam/app/Services/Exam-ResourceService.php
|
||||||
|
|
||||||
|
# Copy built assets from node stage
|
||||||
|
COPY --from=node-builder --chown=www-data:www-data /app/public/build ./public/build
|
||||||
|
|
||||||
|
# Copy environment file from docker.env to .env if .env doesn't exist
|
||||||
|
# RUN if [ ! -f .env ]; then cp docker.env .env; fi
|
||||||
|
|
||||||
|
# Generate APP_KEY if not present (required for some Composer operations)
|
||||||
|
RUN if ! grep -q "APP_KEY=base64:" .env; then \
|
||||||
|
php artisan key:generate --no-interaction || \
|
||||||
|
echo "APP_KEY=base64:$(openssl rand -base64 32)" >> .env; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create necessary directories before Composer install
|
||||||
|
RUN mkdir -p storage/logs storage/framework/cache storage/framework/sessions storage/framework/views \
|
||||||
|
&& mkdir -p bootstrap/cache
|
||||||
|
|
||||||
|
# Debug: Check Composer and PHP setup
|
||||||
|
RUN composer --version && php --version
|
||||||
|
|
||||||
|
# Configure Composer
|
||||||
|
ENV COMPOSER_ALLOW_SUPERUSER=1
|
||||||
|
ENV COMPOSER_NO_INTERACTION=1
|
||||||
|
ENV COMPOSER_MEMORY_LIMIT=2G
|
||||||
|
|
||||||
|
# Update composer.lock to match PHP version and install dependencies
|
||||||
|
# Update symfony packages to resolve security advisories
|
||||||
|
RUN composer update symfony/http-foundation symfony/http-kernel --with-all-dependencies --no-dev --optimize-autoloader --no-interaction --verbose \
|
||||||
|
&& composer install --no-dev --optimize-autoloader --no-interaction --verbose
|
||||||
|
|
||||||
|
# Set permissions
|
||||||
|
RUN chown -R www-data:www-data /var/www/html \
|
||||||
|
&& chmod -R 755 /var/www/html/storage \
|
||||||
|
&& chmod -R 755 /var/www/html/bootstrap/cache
|
||||||
|
|
||||||
|
# Create necessary directories
|
||||||
|
RUN mkdir -p /var/www/html/storage/logs \
|
||||||
|
&& mkdir -p /var/www/html/storage/framework/cache \
|
||||||
|
&& mkdir -p /var/www/html/storage/framework/sessions \
|
||||||
|
&& mkdir -p /var/www/html/storage/framework/views \
|
||||||
|
&& mkdir -p /var/www/html/storage/app/public \
|
||||||
|
&& mkdir -p /var/log/supervisor \
|
||||||
|
&& mkdir -p /var/log/nginx \
|
||||||
|
&& mkdir -p /var/run \
|
||||||
|
&& chown -R www-data:www-data /var/www/html/storage
|
||||||
|
|
||||||
|
# Fix Nginx temp directories permissions for file uploads
|
||||||
|
RUN chown -R www-data:www-data /var/lib/nginx/ \
|
||||||
|
&& chmod -R 755 /var/lib/nginx/tmp
|
||||||
|
|
||||||
|
# Create storage symlink and test files
|
||||||
|
RUN php artisan storage:link || echo "Storage link creation failed, but continuing..." \
|
||||||
|
&& echo '<?php echo "Laravel Test: " . date("Y-m-d H:i:s") . "<br>PHP Version: " . phpversion(); ?>' > /var/www/html/public/test.php \
|
||||||
|
&& echo 'healthy' > /var/www/html/public/health \
|
||||||
|
&& echo '<?php echo "Installer should redirect to: /install/step-1<br>"; echo "Routes available: "; echo "<pre>"; print_r(glob("/var/www/html/Modules/*/routes/*.php")); echo "</pre>"; ?>' > /var/www/html/public/debug.php \
|
||||||
|
&& chmod 644 /var/www/html/public/test.php /var/www/html/public/health /var/www/html/public/debug.php
|
||||||
|
|
||||||
|
# Ensure the app is NOT marked as installed (for first-time setup)
|
||||||
|
# RUN rm -f /var/www/html/public/installed
|
||||||
|
|
||||||
|
# Clear any cached routes/config that might interfere with installation
|
||||||
|
RUN php artisan config:clear || true \
|
||||||
|
&& php artisan route:clear || true \
|
||||||
|
&& php artisan view:clear || true
|
||||||
|
|
||||||
|
# Expose ports
|
||||||
|
EXPOSE 80
|
||||||
|
|
||||||
|
# Health check (more lenient)
|
||||||
|
HEALTHCHECK --interval=60s --timeout=10s --start-period=30s --retries=5 \
|
||||||
|
CMD curl -f http://localhost:80/health || curl -f http://localhost:80/test.php || exit 1
|
||||||
|
|
||||||
|
# Start supervisor
|
||||||
|
CMD ["sh", "-c", "mkdir -p storage/framework/cache storage/framework/sessions storage/framework/views storage/logs bootstrap/cache storage/app && touch storage/installed storage/app/installed public/installed && chown -R www-data:www-data storage bootstrap/cache public/installed && chmod -R 775 storage bootstrap/cache && if [ -f .env ]; then chmod 666 .env || true; fi && php artisan migrate --force && php artisan optimize:clear && /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf"]
|
||||||
Loading…
Reference in New Issue
Block a user