Merge branch 'main' of https://git.steelants.cz/JonatanRek/DOCKER_PHP_BASE

apache/Dockerfile

@@ -57,6 +57,9 @@ RUN a2enmod rewrite
 RUN docker-php-ext-configure intl
 
 # Install PHP extensions
+RUN docker-php-ext-configure \
+    opcache --enable-opcache
+
 RUN docker-php-ext-install \
     pdo_mysql \
     pgsql \
@@ -70,7 +73,9 @@ RUN docker-php-ext-install \
     gd \
     intl
 
-RUN docker-php-ext-enable imagick
+RUN docker-php-ext-enable \
+    imagick \
+    opcache
 
 # PHP
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_FILE" && \
@@ -80,7 +85,7 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_FILE" && \
 	printf '[Date]\ndate.timezone="%s"\n', $TZ > "$PHP_INI_DIR/conf.d/tzone.ini"
 
 #OPCACHE
-RUN echo '\n\
+RUN echo "\n\
 [opcache]\n\
 opcache.enable=1\n\
 opcache.revalidate_freq=0\n\
@@ -89,7 +94,7 @@ opcache.max_accelerated_files=${PHP_OPCACHE_MAX_ACCELERATED_FILES}\n\
 opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}\n\
 opcache.max_wasted_percentage=${PHP_OPCACHE_MAX_WASTED_PERCENTAGE}\n\
 opcache.interned_strings_buffer=16\n\
-opcache.fast_shutdown=1' >> "$PHP_INI_DIR/conf.d/opcache.ini"
+opcache.fast_shutdown=1" >> "$PHP_INI_DIR/conf.d/opcache.ini"
 
 #SUPERVISORD
 RUN mkdir -p /var/log/supervisor

apache/supervisor/conf.d/laravel-queues.conf

@@ -1,19 +1,19 @@
 [program:queue-default]
-command=/usr/local/bin/php /var/www/html/artisan queue:work --queue=default,importstatistics
+command=/usr/local/bin/php /var/www/html/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 /var/www/html/artisan queue:work --queue=statistics
+command=/usr/local/bin/php /var/www/html/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 /var/www/html/artisan queue:work --queue=detections
+command=/usr/local/bin/php /var/www/html/artisan queue:work --sleep=3 --tries=3 --queue=detections
 user=www-data
 autostart=true
 autorestart=true

fmp-alpine/Dockerfile

@@ -38,21 +38,20 @@ RUN apk add --no-cache --virtual .build-deps \
     libxml2-dev \
     linux-headers
 
-RUN docker-php-ext-configure gd \
+RUN docker-php-ext-configure \
-        --with-freetype \
+    gd --with-freetype --with-jpeg \
-        --with-jpeg \
+    && docker-php-ext-install -j$(nproc) \
-        && docker-php-ext-install -j$(nproc) \
+    pdo_mysql \
-        pdo_mysql \
+    pdo_pgsql \
-        pdo_pgsql \
+    pgsql \
-        pgsql \
+    zip \
-        zip \
+    bcmath \
-        bcmath \
+    soap \
-        soap \
+    gd \
-        gd \
+    intl \
-        intl \
+    opcache \
-        opcache \
+    sockets \
-        sockets \
+    pcntl
-        pcntl
 
 RUN pecl install imagick \
  && docker-php-ext-enable imagick