diff --git a/bookstack/Dockerfile b/bookstack/Dockerfile index 4a93dd8..13c86cd 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -12,23 +12,23 @@ RUN \ apk add --no-cache \ mariadb-client=10.11.5-r3 \ nginx=1.24.0-r14 \ - php81-curl=8.1.26-r0 \ - php81-dom=8.1.26-r0 \ - php81-fileinfo=8.1.26-r0 \ - php81-fpm=8.1.26-r0 \ - php81-gd=8.1.26-r0 \ - php81-iconv=8.1.26-r0 \ - php81-ldap=8.1.26-r0 \ - php81-mbstring=8.1.26-r0 \ - php81-mysqlnd=8.1.26-r0 \ - php81-openssl=8.1.26-r0 \ - php81-pdo_mysql=8.1.26-r0 \ - php81-session=8.1.26-r0 \ - php81-simplexml=8.1.26-r0 \ - php81-tokenizer=8.1.26-r0 \ - php81-xml=8.1.26-r0 \ - php81-xmlwriter=8.1.26-r0 \ - php81=8.1.26-r0 \ + php82-curl=8.2.13-r0 \ + php82-dom=8.2.13-r0 \ + php82-fileinfo=8.2.13-r0 \ + php82-fpm=8.2.13-r0 \ + php82-gd=8.2.13-r0 \ + php82-iconv=8.2.13-r0 \ + php82-ldap=8.2.13-r0 \ + php82-mbstring=8.2.13-r0 \ + php82-mysqlnd=8.2.13-r0 \ + php82-openssl=8.2.13-r0 \ + php82-pdo_mysql=8.2.13-r0 \ + php82-session=8.2.13-r0 \ + php82-simplexml=8.2.13-r0 \ + php82-tokenizer=8.2.13-r0 \ + php82-xml=8.2.13-r0 \ + php82-xmlwriter=8.2.13-r0 \ + php82=8.2.13-r0 \ \ && apk add --no-cache --virtual .build-dependencies \ composer=2.6.6-r0 \ diff --git a/bookstack/rootfs/etc/cont-init.d/bookstack.sh b/bookstack/rootfs/etc/cont-init.d/bookstack.sh index da91a96..cd9c602 100755 --- a/bookstack/rootfs/etc/cont-init.d/bookstack.sh +++ b/bookstack/rootfs/etc/cont-init.d/bookstack.sh @@ -81,7 +81,7 @@ ln -s /data/bookstack/uploads /var/www/bookstack/public/uploads # Create API key if needed if ! bashio::fs.file_exists "/data/bookstack/appkey.txt"; then bashio::log.info "Generating app key" - key=$(php81 /var/www/bookstack/artisan key:generate --show) + key=$(php82 /var/www/bookstack/artisan key:generate --show) echo "${key}" > /data/bookstack/appkey.txt bashio::log.info "App Key generated: ${key}" fi diff --git a/bookstack/rootfs/etc/php81/php-fpm.d/www.conf b/bookstack/rootfs/etc/php82/php-fpm.d/www.conf similarity index 100% rename from bookstack/rootfs/etc/php81/php-fpm.d/www.conf rename to bookstack/rootfs/etc/php82/php-fpm.d/www.conf diff --git a/bookstack/rootfs/etc/services.d/php-fpm/run b/bookstack/rootfs/etc/services.d/php-fpm/run index c265123..9dab4eb 100755 --- a/bookstack/rootfs/etc/services.d/php-fpm/run +++ b/bookstack/rootfs/etc/services.d/php-fpm/run @@ -46,8 +46,8 @@ if bashio::config.equals 'log_level' 'debug' \ fi bashio::log.info "Installing/updating Database" -php81 /var/www/bookstack/artisan migrate --force +php82 /var/www/bookstack/artisan migrate --force bashio::log.info "Starting PHP-FPM..." -exec php-fpm81 -R --nodaemonize +exec php-fpmphp82 -R --nodaemonize