diff --git a/.github/renovate.json b/.github/renovate.json index 429e127..503cb4f 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -23,7 +23,7 @@ ], "versioningTemplate": "loose", "datasourceTemplate": "repology", - "depNameTemplate": "alpine_3_18/{{package}}" + "depNameTemplate": "alpine_3_19/{{package}}" }, { "fileMatch": ["/Dockerfile$"], diff --git a/tasmoadmin/Dockerfile b/tasmoadmin/Dockerfile index 406370f..84ba7aa 100755 --- a/tasmoadmin/Dockerfile +++ b/tasmoadmin/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.3.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/base-nodejs:0.1.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -10,22 +10,20 @@ ARG TASMOADMIN_VERSION="v3.3.2" # hadolint ignore=DL3003 RUN \ apk add --no-cache \ - nginx=1.24.0-r7 \ - php81-curl=8.1.26-r0 \ - php81-dom=8.1.26-r0 \ - php81-fpm=8.1.26-r0 \ - php81-iconv=8.1.26-r0 \ - php81-mbstring=8.1.26-r0 \ - php81-opcache=8.1.26-r0 \ - php81-session=8.1.26-r0 \ - php81-zip=8.1.26-r0 \ - php81=8.1.26-r0 \ + nginx=1.24.0-r14 \ + php82-curl=8.2.14-r0 \ + php82-dom=8.2.14-r0 \ + php82-fpm=8.2.14-r0 \ + php82-iconv=8.2.14-r0 \ + php82-mbstring=8.2.14-r0 \ + php82-opcache=8.2.14-r0 \ + php82-session=8.2.14-r0 \ + php82-zip=8.2.14-r0 \ + php82=8.2.14-r0 \ \ && apk add --no-cache --virtual .build-dependencies \ - composer=2.6.5-r0 \ - git=2.40.1-r0 \ - nodejs=18.18.2-r0 \ - npm=9.6.6-r0 \ + composer=2.6.6-r0 \ + git=2.43.0-r0 \ \ && git clone --branch "${TASMOADMIN_VERSION}" --depth=1 \ "https://github.com/TasmoAdmin/TasmoAdmin.git" /var/www/tasmoadmin \ diff --git a/tasmoadmin/build.yaml b/tasmoadmin/build.yaml index 0f64554..4f66e9a 100644 --- a/tasmoadmin/build.yaml +++ b/tasmoadmin/build.yaml @@ -1,8 +1,8 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/base:14.3.3 - amd64: ghcr.io/hassio-addons/base:14.3.3 - armv7: ghcr.io/hassio-addons/base:14.3.3 + aarch64: ghcr.io/hassio-addons/base-nodejs:0.1.0 + amd64: ghcr.io/hassio-addons/base-nodejs:0.1.0 + armv7: ghcr.io/hassio-addons/base-nodejs:0.1.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev diff --git a/tasmoadmin/rootfs/etc/php81/blacklist.txt b/tasmoadmin/rootfs/etc/php82/blacklist.txt similarity index 100% rename from tasmoadmin/rootfs/etc/php81/blacklist.txt rename to tasmoadmin/rootfs/etc/php82/blacklist.txt diff --git a/tasmoadmin/rootfs/etc/php81/conf.d/99-tasmoadmin.ini b/tasmoadmin/rootfs/etc/php82/conf.d/99-tasmoadmin.ini similarity index 100% rename from tasmoadmin/rootfs/etc/php81/conf.d/99-tasmoadmin.ini rename to tasmoadmin/rootfs/etc/php82/conf.d/99-tasmoadmin.ini diff --git a/tasmoadmin/rootfs/etc/php81/php-fpm.d/www.conf b/tasmoadmin/rootfs/etc/php82/php-fpm.d/www.conf similarity index 100% rename from tasmoadmin/rootfs/etc/php81/php-fpm.d/www.conf rename to tasmoadmin/rootfs/etc/php82/php-fpm.d/www.conf diff --git a/tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run b/tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run index eb87a8d..afcca0c 100755 --- a/tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run +++ b/tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run @@ -5,4 +5,4 @@ # Runs the PHP-FPM daemon # ============================================================================== bashio::log.info "Starting PHP-FPM server..." -exec php-fpm81 -R --nodaemonize +exec php-fpm82 -R --nodaemonize