diff --git a/tasmoadmin/Dockerfile b/tasmoadmin/Dockerfile index 83ccfa6..84a8495 100755 --- a/tasmoadmin/Dockerfile +++ b/tasmoadmin/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/base:12.2.3 +ARG BUILD_FROM=ghcr.io/hassio-addons/base:13.0.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -10,21 +10,21 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN \ apk add --no-cache \ nginx=1.22.1-r0 \ - php8-curl=8.0.25-r0 \ - php8-dom=8.0.25-r0 \ - php8-fpm=8.0.25-r0 \ - php8-iconv=8.0.25-r0 \ - php8-mbstring=8.0.25-r0 \ - php8-opcache=8.0.25-r0 \ - php8-session=8.0.25-r0 \ - php8-zip=8.0.25-r0 \ - php8=8.0.25-r0 \ + php81-curl=8.1.13-r0 \ + php81-dom=8.1.13-r0 \ + php81-fpm=8.1.13-r0 \ + php81-iconv=8.1.13-r0 \ + php81-mbstring=8.1.13-r0 \ + php81-opcache=8.1.13-r0 \ + php81-session=8.1.13-r0 \ + php81-zip=8.1.13-r0 \ + php81=8.1.13-r0 \ \ && apk add --no-cache --virtual .build-dependencies \ - composer=2.4.2-r0 \ - git=2.36.3-r0 \ - nodejs=16.17.1-r0 \ - npm=8.10.0-r0 \ + composer=2.4.4-r \ + git=2.38.2-r0 \ + nodejs=18.12.1-r0 \ + npm=9.1.2-r0 \ \ && git clone --branch "v2.1.1" --depth=1 \ "https://github.com/TasmoAdmin/TasmoAdmin.git" /var/www/tasmoadmin \ diff --git a/tasmoadmin/build.yaml b/tasmoadmin/build.yaml index 267709e..e3d1f7d 100644 --- a/tasmoadmin/build.yaml +++ b/tasmoadmin/build.yaml @@ -1,10 +1,10 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/base:12.2.3 - amd64: ghcr.io/hassio-addons/base:12.2.3 - armhf: ghcr.io/hassio-addons/base:12.2.3 - armv7: ghcr.io/hassio-addons/base:12.2.3 - i386: ghcr.io/hassio-addons/base:12.2.3 + aarch64: ghcr.io/hassio-addons/base:13.0.0 + amd64: ghcr.io/hassio-addons/base:13.0.0 + armhf: ghcr.io/hassio-addons/base:13.0.0 + armv7: ghcr.io/hassio-addons/base:13.0.0 + i386: ghcr.io/hassio-addons/base:13.0.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev diff --git a/tasmoadmin/rootfs/etc/php8/blacklist.txt b/tasmoadmin/rootfs/etc/php81/blacklist.txt similarity index 100% rename from tasmoadmin/rootfs/etc/php8/blacklist.txt rename to tasmoadmin/rootfs/etc/php81/blacklist.txt diff --git a/tasmoadmin/rootfs/etc/php8/conf.d/99-tasmoadmin.ini b/tasmoadmin/rootfs/etc/php81/conf.d/99-tasmoadmin.ini similarity index 100% rename from tasmoadmin/rootfs/etc/php8/conf.d/99-tasmoadmin.ini rename to tasmoadmin/rootfs/etc/php81/conf.d/99-tasmoadmin.ini diff --git a/tasmoadmin/rootfs/etc/php8/php-fpm.d/www.conf b/tasmoadmin/rootfs/etc/php81/php-fpm.d/www.conf similarity index 100% rename from tasmoadmin/rootfs/etc/php8/php-fpm.d/www.conf rename to tasmoadmin/rootfs/etc/php81/php-fpm.d/www.conf diff --git a/tasmoadmin/rootfs/etc/services.d/php-fpm/run b/tasmoadmin/rootfs/etc/services.d/php-fpm/run index 6dd71ad..83bea0d 100755 --- a/tasmoadmin/rootfs/etc/services.d/php-fpm/run +++ b/tasmoadmin/rootfs/etc/services.d/php-fpm/run @@ -4,4 +4,4 @@ # Runs the PHP-FPM daemon # ============================================================================== bashio::log.info "Starting PHP-FPM server..." -exec php-fpm8 -R --nodaemonize +exec php-fpm81 -R --nodaemonize