diff --git a/Dockerfile b/Dockerfile index b98983e..797f518 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,16 +3,18 @@ FROM php:8.3-fpm RUN apt-get update && apt-get install -y \ git unzip zip curl libpng-dev libjpeg62-turbo-dev libfreetype6-dev \ libonig-dev libxml2-dev libzip-dev libpq-dev libicu-dev libxslt-dev \ - libsqlite3-dev sqlite3 cron supervisor bash nano \ - default-mysql-client \ + libsqlite3-dev sqlite3 cron supervisor bash nano default-mysql-client \ && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \ && apt-get install -y nodejs \ && npm install -g npm \ && docker-php-ext-configure gd --with-freetype --with-jpeg \ - && docker-php-ext-install gd pdo_mysql zip bcmath intl xsl pcntl sockets + && docker-php-ext-install -j$(nproc) gd pdo_mysql zip bcmath intl xsl pcntl sockets \ + && docker-php-ext-install opcache \ + && pecl install redis && docker-php-ext-enable redis COPY --from=composer:latest /usr/bin/composer /usr/bin/composer - +COPY ./docker/php/php.ini /usr/local/etc/php/conf.d/custom-php.ini +COPY ./docker/php/opcache.ini /usr/local/etc/php/conf.d/opcache.ini COPY ./data/html/ /var/www/html/ RUN chown -R www-data:www-data /var/www/html diff --git a/Dockerfile.queue b/Dockerfile.queue index 2f398f9..342457d 100644 --- a/Dockerfile.queue +++ b/Dockerfile.queue @@ -2,8 +2,9 @@ FROM php:8.3-fpm # 安裝必要套件與 PHP 擴充 RUN apt-get update && apt-get install -y \ - git unzip zip curl libzip-dev libonig-dev libxml2-dev supervisor && \ - docker-php-ext-install pdo_mysql zip bcmath + git unzip zip curl libzip-dev libonig-dev libxml2-dev supervisor \ + && docker-php-ext-install pdo_mysql zip bcmath \ + && pecl install redis && docker-php-ext-enable redis COPY ./data/html/ /var/www/html/ diff --git a/docker-compose.git.yml b/docker-compose.git.yml index e86fe31..5364a1c 100644 --- a/docker-compose.git.yml +++ b/docker-compose.git.yml @@ -6,7 +6,7 @@ services: container_name: git_worker volumes: - ./data:/app - - ./data/logs/git/:/var/log/ + - ./data/git/logs/:/var/log/ environment: - REPO_URL=${REPO_URL} - BRANCH=${REPO_BRANCH} diff --git a/docker-compose.yml b/docker-compose.yml index 45fa1e1..933ed2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,6 @@ services: - ./data/mariadb/conf.d:/etc/mysql/conf.d - ./data/mariadb/logs:/var/log/mysql - ./docker/mariadb/my.cnf:/etc/mysql/conf.d/custom.cnf - ports: - "3306:3306" networks: @@ -26,8 +25,8 @@ services: volumes: - ./data/html:/var/www/html - ./data/php/logs:/var/www/logs - - ./data/php:/usr/local/etc/php/ - - ./docker/php/php.ini:/usr/local/etc/php/php.ini:ro + - ./docker/php/conf.d/:/usr/local/etc/php/conf.d/custom-php.ini + - ./docker/php/opcache.ini:/usr/local/etc/php/conf.d/opcache.ini depends_on: - mariadb environment: diff --git a/docker/php/opcache.ini b/docker/php/opcache.ini new file mode 100644 index 0000000..c7dce53 --- /dev/null +++ b/docker/php/opcache.ini @@ -0,0 +1,8 @@ +opcache.enable=1 +opcache.enable_cli=1 +opcache.memory_consumption=128 +opcache.interned_strings_buffer=8 +opcache.max_accelerated_files=10000 +opcache.validate_timestamps=0 +opcache.revalidate_freq=0 +opcache.fast_shutdown=1 \ No newline at end of file