diff --git a/hidche/app/Dockerfile b/hidche/app/Dockerfile index b19885b..b9bba83 100644 --- a/hidche/app/Dockerfile +++ b/hidche/app/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1-fpm-bullseye +FROM php:8.2-fpm-bullseye #debian ENV LC_ALL=C.UTF-8 @@ -7,11 +7,11 @@ RUN apt -y update ;\ apt -y install \ bzip2 git rsync \ libmemcached-dev libcurl4-openssl-dev \ - libicu-dev libjpeg-dev libpng-dev libwebp-dev libfreetype6-dev \ + libicu-dev libjpeg-dev libpng-dev libwebp-dev libavif-dev libfreetype6-dev \ libzip-dev libxml2-dev libsqlite3-dev gosu build-essential; RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure gd --with-freetype --with-webp --with-jpeg --with-png ; \ + docker-php-ext-configure gd --with-freetype --with-webp --with-avif --with-jpeg --with-png ; \ docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd; \ docker-php-ext-configure mysqli --with-mysqli=mysqlnd; \ docker-php-ext-install -j "$(nproc)" \ diff --git a/hidche/board/Dockerfile b/hidche/board/Dockerfile index d8610b0..a1e3b09 100644 --- a/hidche/board/Dockerfile +++ b/hidche/board/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4-fpm-bullseye +FROM php:8.2-fpm-bullseye #debian ENV LC_ALL=C.UTF-8 @@ -6,12 +6,12 @@ ENV LC_ALL=C.UTF-8 RUN apt -y update ;\ apt -y install \ bzip2 git rsync \ - libmemcached-dev libcurl4-openssl-dev libmcrypt-dev \ - libicu-dev libjpeg-dev libpng-dev libwebp-dev libfreetype6-dev \ + libmemcached-dev libcurl4-openssl-dev \ + libicu-dev libjpeg-dev libpng-dev libwebp-dev libavif-dev libfreetype6-dev \ libzip-dev libxml2-dev libsqlite3-dev gosu build-essential; RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gd --with-freetype --with-webp --with-avif --with-jpeg --with-png ; \ docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd; \ docker-php-ext-configure mysqli --with-mysqli=mysqlnd; \ docker-php-ext-install -j "$(nproc)" \ @@ -23,21 +23,9 @@ RUN debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ pdo_mysql \ mysqli \ zip; -RUN pecl install memcached mcrypt; +RUN pecl install memcached ds; #from nextcloud setting -RUN { \ - echo 'opcache.enable=1'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=10000'; \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.save_comments=1'; \ - echo 'opcache.revalidate_freq=1'; \ - } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ - \ - echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ - \ - echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ - mkdir -p /var/www/board; \ +RUN mkdir -p /var/www/board; \ mkdir -p /var/www/.ssh; COPY entrypoint.sh /usr/local/bin/ diff --git a/hidche/web/default.conf b/hidche/web/default.conf index 6c2872d..adce24d 100644 --- a/hidche/web/default.conf +++ b/hidche/web/default.conf @@ -25,6 +25,7 @@ server { include fastcgi_params; fastcgi_pass board:9000; fastcgi_index index.php; + fastcgi_param REMOTE_ADDR $http_x_real_ip; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } } @@ -36,6 +37,7 @@ server { proxy_read_timeout 600; fastcgi_pass app:9000; fastcgi_index index.php; + fastcgi_param REMOTE_ADDR $http_x_real_ip; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } }