Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.git
.github
node_modules
vendor
.env
tests
storage/framework/cache/data/*
storage/framework/sessions/*
storage/framework/views/*
storage/logs/*
81 changes: 81 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
FROM dunglas/frankenphp:1.4-php8.4-alpine

# Set environment variables for Puppeteer and Laravel
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser \
COMPOSER_ALLOW_SUPERUSER=1 \
SERVER_NAME=:80 \
PUBLIC_ROOT=/app/public

# Install system dependencies
RUN apk add --no-cache \
chromium \
nss \
freetype \
harfbuzz \
ca-certificates \
ttf-freefont \
nodejs \
npm \
libpng-dev \
libjpeg-turbo-dev \
freetype-dev \
icu-dev \
libzip-dev \
postgresql-dev \
git \
unzip \
bash

# Install PHP extensions
RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
&& docker-php-ext-install -j$(nproc) \
pdo_pgsql \
intl \
zip \
gd \
opcache

# Install Redis extension
RUN apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& apk del .build-deps

# Set working directory
WORKDIR /app

# Copy composer files first for better caching
COPY composer.json composer.lock ./
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& composer install --no-dev --no-scripts --no-autoloader

# Copy the rest of the application
COPY . .

# Run composer autoloader and scripts
RUN composer install --no-dev --optimize-autoloader

# Install NPM dependencies and build assets
RUN npm install \
&& npm run build \
&& rm -rf node_modules

# Set permissions for Laravel
RUN chown -R www-data:www-data storage bootstrap/cache \
&& chmod -R 775 storage bootstrap/cache

# Production OPcache settings
RUN { \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
echo 'opcache.enable_cli=1'; \
} > /usr/local/etc/php/conf.d/opcache-recommended.ini

# Expose port 80
EXPOSE 80

# The entrypoint is already set to frankenphp in the base image
24 changes: 12 additions & 12 deletions app/Http/Controllers/Admin/SchoolVehicleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public function index()
{
abort_unless(Gate::allows('admin'), 403, 'Forbidden');

$schoolVehicles = SchoolVehicle::paginate(10);
$schoolVehicles = SchoolVehicle::with('schoolDriver')->paginate(10);
return view('admin.school_vehicles.index', compact('schoolVehicles'));
}

Expand Down Expand Up @@ -160,15 +160,15 @@ public function search(Request $request)
{
abort_unless(Gate::allows('admin'), 403, 'Forbidden');

$search = $request->get('search');
$schoolVehicles = SchoolVehicle::where('id', 'like', '%' . $search . '%')
->orWhere('school_driver_id', 'like', '%' . $search . '%')
->orWhere('make', 'like', '%' . $search . '%')
->orWhere('model', 'like', '%' . $search . '%')
->orWhere('year', 'like', '%' . $search . '%')
->orWhere('number_plate', 'like', '%' . $search . '%')
->orWhere('capacity', 'like', '%' . $search . '%')
->paginate(10);
$schoolVehicles = SchoolVehicle::with('schoolDriver')->where(function ($query) use ($search) {
$query->where('id', 'like', '%' . $search . '%')
->orWhere('school_driver_id', 'like', '%' . $search . '%')
->orWhere('make', 'like', '%' . $search . '%')
->orWhere('model', 'like', '%' . $search . '%')
->orWhere('year', 'like', '%' . $search . '%')
->orWhere('number_plate', 'like', '%' . $search . '%')
->orWhere('capacity', 'like', '%' . $search . '%');
})->paginate(10);

return view('admin.school_vehicles.index', compact('schoolVehicles'));
}
Expand All @@ -183,9 +183,9 @@ public function filter(Request $request)
$status = $request->get('status');

if ($status === 'All') {
$schoolVehicles = SchoolVehicle::paginate(10);
$schoolVehicles = SchoolVehicle::with('schoolDriver')->paginate(10);
} else {
$schoolVehicles = SchoolVehicle::where('availability_status', $status)->paginate(10);
$schoolVehicles = SchoolVehicle::with('schoolDriver')->where('availability_status', $status)->paginate(10);
}

return view('admin.school_vehicles.index', compact('schoolVehicles'));
Expand Down
Loading
Loading