From c8b5d790be2283c952243aefe02332c654a727e7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 19:35:52 -0500
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ghcr.io/hassio-ad?=
 =?UTF-8?q?dons/base=20Docker=20tag=20to=20v15=20(#277)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⬆️ Update ghcr.io/hassio-addons/base Docker tag to v15

* Update dependencies

* PHP82

* ⬆️ Update php to 8.2.14

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Franck Nijhof <git@frenck.dev>
Co-authored-by: Paul Sinclair <sinclairpaul@hotmail.com>
---
 .github/renovate.json                         |  2 +-
 bookstack/Dockerfile                          | 42 +++++++++----------
 bookstack/build.yaml                          |  6 +--
 bookstack/rootfs/etc/cont-init.d/bookstack.sh |  2 +-
 .../etc/{php81 => php82}/php-fpm.d/www.conf   |  0
 bookstack/rootfs/etc/services.d/php-fpm/run   |  4 +-
 6 files changed, 28 insertions(+), 28 deletions(-)
 rename bookstack/rootfs/etc/{php81 => php82}/php-fpm.d/www.conf (100%)

diff --git a/.github/renovate.json b/.github/renovate.json
index 39f0a23..c025ac9 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/bookstack/Dockerfile b/bookstack/Dockerfile
index 1574382..bbf2a16 100644
--- a/bookstack/Dockerfile
+++ b/bookstack/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.3.3
+ARG BUILD_FROM=ghcr.io/hassio-addons/base:15.0.1
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -10,28 +10,28 @@ ARG BOOKSTACK_VERSION="v23.12"
 # hadolint ignore=DL3003
 RUN \
     apk add --no-cache \
-        mariadb-client=10.11.5-r0 \
-        nginx=1.24.0-r7 \
-        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 \
+        mariadb-client=10.11.5-r3 \
+        nginx=1.24.0-r14 \
+        php82-curl=8.2.14-r0 \
+        php82-dom=8.2.14-r0 \
+        php82-fileinfo=8.2.14-r0 \
+        php82-fpm=8.2.14-r0 \
+        php82-gd=8.2.14-r0 \
+        php82-iconv=8.2.14-r0 \
+        php82-ldap=8.2.14-r0 \
+        php82-mbstring=8.2.14-r0 \
+        php82-mysqlnd=8.2.14-r0 \
+        php82-openssl=8.2.14-r0 \
+        php82-pdo_mysql=8.2.14-r0 \
+        php82-session=8.2.14-r0 \
+        php82-simplexml=8.2.14-r0 \
+        php82-tokenizer=8.2.14-r0 \
+        php82-xml=8.2.14-r0 \
+        php82-xmlwriter=8.2.14-r0 \
+        php82=8.2.14-r0 \
     \
     && apk add --no-cache --virtual .build-dependencies \
-       composer=2.6.5-r0 \
+       composer=2.6.6-r0 \
     \
     && curl -J -L -o /tmp/bookstack.tar.gz \
         "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz" \
diff --git a/bookstack/build.yaml b/bookstack/build.yaml
index 0f64554..2b1d3e4 100644
--- a/bookstack/build.yaml
+++ b/bookstack/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:15.0.1
+  amd64: ghcr.io/hassio-addons/base:15.0.1
+  armv7: ghcr.io/hassio-addons/base:15.0.1
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev
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