From 024e8585f845ee0a239fea098f6faee5066aa3fe Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 24 May 2024 09:57:38 +0200
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/hassio-ad?=
 =?UTF-8?q?dons/base=20Docker=20tag=20to=20v16=20(#405)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Franck Nijhof <git@frenck.dev>
---
 .github/renovate.json                         |  2 +-
 tasmoadmin/Dockerfile                         | 22 +++++++++----------
 tasmoadmin/build.yaml                         |  6 ++---
 .../rootfs/etc/{php82 => php83}/blacklist.txt |  0
 .../{php82 => php83}/conf.d/99-tasmoadmin.ini |  0
 .../etc/{php82 => php83}/php-fpm.d/www.conf   |  0
 .../rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)
 rename tasmoadmin/rootfs/etc/{php82 => php83}/blacklist.txt (100%)
 rename tasmoadmin/rootfs/etc/{php82 => php83}/conf.d/99-tasmoadmin.ini (100%)
 rename tasmoadmin/rootfs/etc/{php82 => php83}/php-fpm.d/www.conf (100%)

diff --git a/.github/renovate.json b/.github/renovate.json
index 1df5eeb..13d06fe 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -24,7 +24,7 @@
       ],
       "versioningTemplate": "loose",
       "datasourceTemplate": "repology",
-      "depNameTemplate": "alpine_3_19/{{package}}"
+      "depNameTemplate": "alpine_3_20/{{package}}"
     },
     {
       "fileMatch": ["/Dockerfile$"],
diff --git a/tasmoadmin/Dockerfile b/tasmoadmin/Dockerfile
index d724240..46a7f6e 100755
--- a/tasmoadmin/Dockerfile
+++ b/tasmoadmin/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base:15.0.9
+ARG BUILD_FROM=ghcr.io/hassio-addons/base:16.0.0
 
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
@@ -12,16 +12,16 @@ ARG TASMOADMIN_VERSION="v4.1.0"
 # hadolint ignore=DL3003
 RUN \
     apk add --no-cache \
-        nginx=1.24.0-r16 \
-        php82-curl=8.2.19-r0 \
-        php82-dom=8.2.19-r0 \
-        php82-fpm=8.2.19-r0 \
-        php82-iconv=8.2.19-r0 \
-        php82-mbstring=8.2.19-r0 \
-        php82-opcache=8.2.19-r0 \
-        php82-session=8.2.19-r0 \
-        php82-zip=8.2.19-r0 \
-        php82=8.2.19-r0 \
+        nginx=1.26.0-r1 \
+        php83-curl=8.3.7-r0 \
+        php83-dom=8.3.7-r0 \
+        php83-fpm=8.3.7-r0 \
+        php83-iconv=8.3.7-r0 \
+        php83-mbstring=8.3.7-r0 \
+        php83-opcache=8.3.7-r0 \
+        php83-session=8.3.7-r0 \
+        php83-zip=8.3.7-r0 \
+        php83=8.3.7-r0 \
     \
     && apk add --no-cache --virtual .build-dependencies \
         composer=2.7.6-r0 \
diff --git a/tasmoadmin/build.yaml b/tasmoadmin/build.yaml
index ecaa5e2..dae34aa 100644
--- a/tasmoadmin/build.yaml
+++ b/tasmoadmin/build.yaml
@@ -1,8 +1,8 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base:15.0.9
-  amd64: ghcr.io/hassio-addons/base:15.0.9
-  armv7: ghcr.io/hassio-addons/base:15.0.9
+  aarch64: ghcr.io/hassio-addons/base:16.0.0
+  amd64: ghcr.io/hassio-addons/base:16.0.0
+  armv7: ghcr.io/hassio-addons/base:16.0.0
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev
diff --git a/tasmoadmin/rootfs/etc/php82/blacklist.txt b/tasmoadmin/rootfs/etc/php83/blacklist.txt
similarity index 100%
rename from tasmoadmin/rootfs/etc/php82/blacklist.txt
rename to tasmoadmin/rootfs/etc/php83/blacklist.txt
diff --git a/tasmoadmin/rootfs/etc/php82/conf.d/99-tasmoadmin.ini b/tasmoadmin/rootfs/etc/php83/conf.d/99-tasmoadmin.ini
similarity index 100%
rename from tasmoadmin/rootfs/etc/php82/conf.d/99-tasmoadmin.ini
rename to tasmoadmin/rootfs/etc/php83/conf.d/99-tasmoadmin.ini
diff --git a/tasmoadmin/rootfs/etc/php82/php-fpm.d/www.conf b/tasmoadmin/rootfs/etc/php83/php-fpm.d/www.conf
similarity index 100%
rename from tasmoadmin/rootfs/etc/php82/php-fpm.d/www.conf
rename to tasmoadmin/rootfs/etc/php83/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 afcca0c..c7b298c 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-fpm82 -R --nodaemonize
+exec php-fpm83 -R --nodaemonize