From 5b3bae87571d1af2b455af090b3f74a54b9070f5 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Thu, 23 May 2024 21:50:45 +0200
Subject: [PATCH] Bumped Alpine Version 3.19>3.20

All CT's unsing NGINX:
Added a teporary work around for the repo,
Using te 3.19 one for now

CT -Nextcloud:
Switched from redis to valkey,
Added missing php (Ctype) and imagemagick (SVG) modules
---
 CT-Build/Alpine.yaml                | 9 ++++++---
 CT-Files/nextcloud/Configs/php.conf | 2 +-
 CT-Files/nextcloud/Scripts/Init.sh  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CT-Build/Alpine.yaml b/CT-Build/Alpine.yaml
index cf66e28..fe8bfa1 100644
--- a/CT-Build/Alpine.yaml
+++ b/CT-Build/Alpine.yaml
@@ -1,6 +1,6 @@
 image:
   distribution: "alpinelinux"
-  release: "3.19"
+  release: "3.20"
 
 source:
   downloader: alpinelinux-http
@@ -504,10 +504,12 @@ packages:
     - php83-exif
     - php83-bz2
     - php83-sodium
+    - php83-ctype
     - libpng
     - zlib
     - imagemagick
-    - redis
+    - imagemagick-svg
+    - valkey
     - sudo
     action: install
     variants:
@@ -732,7 +734,8 @@ actions:
   action: |-
     #!/bin/sh
     #Setup Nginx repo
-    echo "@nginx http://nginx.org/packages/mainline/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories
+    #echo "@nginx http://nginx.org/packages/mainline/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories
+    echo "@nginx http://nginx.org/packages/mainline/alpine/v3.19/main" >> /etc/apk/repositories
     curl -L https://nginx.org/keys/nginx_signing.rsa.pub -o /etc/apk/keys/nginx_signing.rsa.pub
     #Install Nginx
     apk add nginx@nginx
diff --git a/CT-Files/nextcloud/Configs/php.conf b/CT-Files/nextcloud/Configs/php.conf
index f6d3f73..2b9b4cc 100644
--- a/CT-Files/nextcloud/Configs/php.conf
+++ b/CT-Files/nextcloud/Configs/php.conf
@@ -27,7 +27,7 @@ php_admin_value[memory_limit] = 512M
 php_admin_value[cgi.fix_pathinfo] = 0
 php_admin_value[allow_url_fopen] = Off
 php_admin_value[file_uploads] = on
-php_admin_value[open_basedir] = /opt/nextcloud/:/var/nextcloud:/run/php-fpm83/php-fpm.sock:/run/redis/redis.sock:/proc/meminfo:/proc/cpuinfo:/dev/urandom:/tmp
+php_admin_value[open_basedir] = /opt/nextcloud/:/var/nextcloud:/run/php-fpm83/php-fpm.sock:/run/valkey/valkey.sock:/proc/meminfo:/proc/cpuinfo:/dev/urandom:/tmp
 php_admin_value[session.use_strict_mode] = 1
 php_admin_value[session.cookie_httponly] = 1
 ;HTTPSONLY php_admin_value[session.cookie_samesite] = Strict
diff --git a/CT-Files/nextcloud/Scripts/Init.sh b/CT-Files/nextcloud/Scripts/Init.sh
index 8c2b812..8ace27f 100644
--- a/CT-Files/nextcloud/Scripts/Init.sh
+++ b/CT-Files/nextcloud/Scripts/Init.sh
@@ -25,4 +25,4 @@ echo "apc.enable_cli=1" >> /etc/php83/php.ini
 #Enable services on boot
 rc-update add nginx
 rc-update add php-fpm83
-rc-update add redis
\ No newline at end of file
+rc-update add valkey
\ No newline at end of file