diff --git a/db/Dockerfile b/db/Dockerfile index 5ed26a0..01bc313 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,4 +1,4 @@ -FROM mariadb:latest +FROM mariadb:10.6 ADD innodb.cnf /etc/mysql/mariadb.conf.d/innodb.cnf diff --git a/docker-compose.yml.dist b/docker-compose.yml.dist index d13c45e..a3867cc 100644 --- a/docker-compose.yml.dist +++ b/docker-compose.yml.dist @@ -18,6 +18,7 @@ services: - "/nextcloud/db:/var/lib/mysql" environment: - MYSQL_ROOT_PASSWORD=toor + - MARIADB_AUTO_UPGRADE=true networks: - internal diff --git a/webservice/Dockerfile b/webservice/Dockerfile index 266d3fc..92eff73 100644 --- a/webservice/Dockerfile +++ b/webservice/Dockerfile @@ -1,6 +1,6 @@ -FROM php:8.0-apache +FROM php:8.1-apache -ENV NEXTCLOUD_VERSION 21.0.5 +ENV NEXTCLOUD_VERSION 26.0.3 RUN \ apt-get update && \ @@ -58,6 +58,8 @@ RUN \ bz2 \ intl \ bcmath \ + sysvsem \ + pcntl \ opcache && \ CFLAGS="-I/usr/src/php" docker-php-ext-install xmlreader @@ -67,14 +69,8 @@ RUN \ docker-php-ext-enable apcu # compile imagick from master branch as there isn't any release for php8 yet. -ENV IMAGICK_SHA 448c1cd0d58ba2838b9b6dff71c9b7e70a401b90 RUN \ - curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/${IMAGICK_SHA}.tar.gz &&\ - tar --strip-components=1 -xf /tmp/imagick.tar.gz &&\ - phpize &&\ - ./configure &&\ - make &&\ - make install &&\ + pecl install imagick && \ docker-php-ext-enable imagick # Activate user-defined .htaccess @@ -98,7 +94,8 @@ ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf ADD update-htaccess.sh /update-htaccess.sh RUN crontab /opt/crontab && chmod +x /update-htaccess.sh +RUN mkdir /nc_data_ext && chown www-data: /nc_data_ext -VOLUME ["/var/www/html/config","/var/www/html/data"] +VOLUME ["/var/www/html/config","/nc_data_ext"] ENTRYPOINT ["supervisord"] diff --git a/webservice/crontab b/webservice/crontab index 23f1bb0..f2b483d 100644 --- a/webservice/crontab +++ b/webservice/crontab @@ -3,4 +3,4 @@ SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # Run cron.php every 15 minutes -*/15 * * * * cd /var/www/html && sudo -u www-data php ./cron.php +*/5 * * * * cd /var/www/html && sudo -u www-data php ./cron.php diff --git a/webservice/nextcloud_php.ini b/webservice/nextcloud_php.ini index d2b64a3..816881a 100644 --- a/webservice/nextcloud_php.ini +++ b/webservice/nextcloud_php.ini @@ -1,10 +1,10 @@ opcache.enable=1 opcache.enable_cli=1 -opcache.interned_strings_buffer=8 +opcache.interned_strings_buffer=16 opcache.max_accelerated_files=10000 opcache.memory_consumption=128 opcache.save_comments=1 -opcache.revalidate_freq=1 +opcache.revalidate_freq=60 memory_limit = 1G apc.enable_cli=1