Progress
Build - Docker Image - PROD / build-apache-amd64 (push) Successful in 1h17m32s
Build - Docker Image - PROD / build-apache-arm64 (push) Canceled after 3m43s
Build - Docker Image - PROD / manifest-apache (push) Canceled after 0s

This commit is contained in:
Jonatan Rek committed 2026-10-31 18:29:05 +01:00
1 parent 6ebb259757
commit 085ab7e9b8
6 files changed
+95 -7

No files matched your search

+5 -2
View File
@@ -1,9 +1,12 @@
# Use PHP with Apache as the base image # Use PHP with Apache as the base image
FROM php:8.4-apache FROM php:8.4-apache
# Application root (default keeps the original /var/www/html layout)
ENV APP_ROOT="/var/www/html"
# Environment # Environment
ENV TZ="Europe/Prague" \ ENV TZ="Europe/Prague" \
APACHE_DOCUMENT_ROOT="/var/www/html/public" \ APACHE_DOCUMENT_ROOT="${APP_ROOT}/public" \
PHP_INI_FILE="$PHP_INI_DIR/php.ini" \ PHP_INI_FILE="$PHP_INI_DIR/php.ini" \
PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \ PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \
PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \ PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \
@@ -114,7 +117,7 @@ COPY ./supervisor/conf.d/laravel-queues.conf /etc/supervisor/conf.d/laravel-queu
# Setup Crone # Setup Crone
RUN mkdir -p /var/log/cron && \ RUN mkdir -p /var/log/cron && \
echo "* * * * * www-data cd /var/www/html && /usr/local/bin/php artisan schedule:run >> /dev/null 2>&1" >> /etc/crontab echo "* * * * * www-data cd ${APP_ROOT} && /usr/local/bin/php artisan schedule:run >> /dev/null 2>&1" >> /etc/crontab
# Install composer # bun # Install composer # bun
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+3 -3
View File
@@ -1,19 +1,19 @@
[program:queue-default] [program:queue-default]
command=/usr/local/bin/php /var/www/html/artisan queue:work --sleep=3 --tries=3 --queue=default,importstatistics command=/usr/local/bin/php %(ENV_APP_ROOT)s/artisan queue:work --sleep=3 --tries=3 --queue=default,importstatistics
user=www-data user=www-data
autostart=true autostart=true
autorestart=true autorestart=true
stdout_logfile=/var/log/supervisor/queue-default.log stdout_logfile=/var/log/supervisor/queue-default.log
[program:queue-statistics] [program:queue-statistics]
command=/usr/local/bin/php /var/www/html/artisan queue:work --sleep=5 --tries=3 --queue=statistics command=/usr/local/bin/php %(ENV_APP_ROOT)s/artisan queue:work --sleep=5 --tries=3 --queue=statistics
user=www-data user=www-data
autostart=true autostart=true
autorestart=true autorestart=true
stdout_logfile=/var/log/supervisor/queue-statistics.log stdout_logfile=/var/log/supervisor/queue-statistics.log
[program:queue-detections] [program:queue-detections]
command=/usr/local/bin/php /var/www/html/artisan queue:work --sleep=3 --tries=3 --queue=detections command=/usr/local/bin/php %(ENV_APP_ROOT)s/artisan queue:work --sleep=3 --tries=3 --queue=detections
user=www-data user=www-data
autostart=true autostart=true
autorestart=true autorestart=true
+44 -2
View File
@@ -1,6 +1,12 @@
FROM php:8.4-fpm-alpine FROM php:8.4-fpm-alpine
# Application root (same default as the apache image)
ENV APP_ROOT="/var/www/html"
ENV TZ="Europe/Prague" \ ENV TZ="Europe/Prague" \
ENABLE_CRON=0 \
ENABLE_SUPERVISOR=0 \
COMPOSER_ALLOW_SUPERUSER=1 \
PHP_OPCACHE_ENABLE=1 \ PHP_OPCACHE_ENABLE=1 \
PHP_OPCACHE_VALIDATE_TIMESTAMPS=0 \ PHP_OPCACHE_VALIDATE_TIMESTAMPS=0 \
PHP_OPCACHE_REVALIDATE_FREQ=0 \ PHP_OPCACHE_REVALIDATE_FREQ=0 \
@@ -25,7 +31,17 @@ RUN apk add --no-cache \
libpng \ libpng \
icu \ icu \
oniguruma \ oniguruma \
libxml2 libxml2 \
libwebp \
git \
nano \
zip \
unzip \
nodejs \
npm \
supervisor \
mysql-client \
postgresql-client
RUN apk add --no-cache --virtual .build-deps \ RUN apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS \ $PHPIZE_DEPS \
@@ -33,13 +49,14 @@ RUN apk add --no-cache --virtual .build-deps \
libzip-dev \ libzip-dev \
freetype-dev \ freetype-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libwebp-dev \
libpng-dev \ libpng-dev \
icu-dev \ icu-dev \
libxml2-dev \ libxml2-dev \
linux-headers linux-headers
RUN docker-php-ext-configure \ RUN docker-php-ext-configure \
gd --with-freetype --with-jpeg \ gd --with-freetype --with-jpeg --with-webp \
&& docker-php-ext-install -j$(nproc) \ && docker-php-ext-install -j$(nproc) \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
@@ -59,6 +76,13 @@ RUN pecl install imagick \
RUN apk del .build-deps RUN apk del .build-deps
# Fail fast if the JPEG delegate did not make it into the image
RUN php -r 'if (!in_array("JPEG", Imagick::queryFormats())) { fwrite(STDERR, "ERROR: imagick built without JPEG delegate\n"); exit(1); } echo "imagick JPEG delegate OK\n";' && \
php -r 'if (!function_exists("imagecreatefromjpeg")) { fwrite(STDERR, "ERROR: gd built without JPEG support\n"); exit(1); } echo "gd JPEG OK\n";'
# Composer
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
&& echo "date.timezone=${TZ}" > "$PHP_INI_DIR/conf.d/99-timezone.ini" && echo "date.timezone=${TZ}" > "$PHP_INI_DIR/conf.d/99-timezone.ini"
@@ -82,3 +106,21 @@ RUN { \
echo "opcache.max_wasted_percentage=${PHP_OPCACHE_MAX_WASTED_PERCENTAGE}"; \ echo "opcache.max_wasted_percentage=${PHP_OPCACHE_MAX_WASTED_PERCENTAGE}"; \
echo "opcache.save_comments=1"; \ echo "opcache.save_comments=1"; \
} > "$PHP_INI_DIR/conf.d/10-opcache.ini" } > "$PHP_INI_DIR/conf.d/10-opcache.ini"
# Supervisor (queue workers, started when ENABLE_SUPERVISOR=1)
RUN mkdir -p /var/log/supervisor
COPY ./supervisor/supervisord.conf /etc/supervisor/supervisord.conf
COPY ./supervisor/conf.d/laravel-queues.conf /etc/supervisor/conf.d/laravel-queues.conf
# Cron (Laravel scheduler, started when ENABLE_CRON=1)
RUN mkdir -p /var/log/cron && \
echo "* * * * * cd ${APP_ROOT} && /usr/local/bin/php artisan schedule:run >> /dev/null 2>&1" > /etc/crontabs/www-data
# Entrypoint
COPY ./docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
RUN chmod +x /usr/local/bin/docker-entrypoint.sh
WORKDIR ${APP_ROOT}
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["php-fpm"]
+17
View File
@@ -0,0 +1,17 @@
#!/bin/sh
set -e
# Optional background services, only started together with php-fpm so that
# one-off commands (php artisan ..., composer ...) are passed through untouched.
case "$1" in
php-fpm*)
if [ "${ENABLE_CRON:-0}" = "1" ]; then
crond -b -L /var/log/cron/cron.log
fi
if [ "${ENABLE_SUPERVISOR:-0}" = "1" ]; then
supervisord -c /etc/supervisor/supervisord.conf
fi
;;
esac
exec docker-php-entrypoint "$@"
@@ -0,0 +1,20 @@
[program:queue-default]
command=/usr/local/bin/php %(ENV_APP_ROOT)s/artisan queue:work --sleep=3 --tries=3 --queue=default,importstatistics
user=www-data
autostart=true
autorestart=true
stdout_logfile=/var/log/supervisor/queue-default.log
[program:queue-statistics]
command=/usr/local/bin/php %(ENV_APP_ROOT)s/artisan queue:work --sleep=5 --tries=3 --queue=statistics
user=www-data
autostart=true
autorestart=true
stdout_logfile=/var/log/supervisor/queue-statistics.log
[program:queue-detections]
command=/usr/local/bin/php %(ENV_APP_ROOT)s/artisan queue:work --sleep=3 --tries=3 --queue=detections
user=www-data
autostart=true
autorestart=true
stdout_logfile=/var/log/supervisor/queue-detections.log
+6
View File
@@ -0,0 +1,6 @@
[supervisord]
logfile=/var/log/supervisor/supervisord.log
pidfile=/run/supervisord.pid
[include]
files = /etc/supervisor/conf.d/*.conf