Merge Dev to Main (Changed Alpine version from 3.22 to 3.23) #9

Merged
brammp merged 5 commits from dev into main 2026-02-18 22:00:39 +01:00
3 changed files with 5 additions and 5 deletions
Showing only changes of commit 11e5be03df - Show all commits

View File

@@ -1,6 +1,6 @@
image: image:
distribution: "alpinelinux" distribution: "alpinelinux"
release: "3.22" release: "3.23"
source: source:
downloader: alpinelinux-http downloader: alpinelinux-http

View File

@@ -7,7 +7,7 @@ rm -rf /etc/nginx/conf.d
mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
#Setup PHP #Setup PHP
ash /opt/Setup/Scripts/PHPTool.sh -d nextcloud || exit 1 ash /opt/Setup/Scripts/PHPTool.sh -d nextcloud -v 84|| exit 1
rm /opt/Setup/Scripts/PHPTool.sh rm /opt/Setup/Scripts/PHPTool.sh

View File

@@ -12,8 +12,8 @@
self=$0 self=$0
Configurations="nextcloud freshrss heimdall mailbackup" Configurations="nextcloud freshrss heimdall mailbackup"
SupportedAlpineVersion=3.22 SupportedAlpineVersion=3.23
NewPHPVer=84 NewPHPVer=85
SkipAlpineRelCheck=false SkipAlpineRelCheck=false
#Git configuration only used for Upgrades and Fresh mode #Git configuration only used for Upgrades and Fresh mode
@@ -25,7 +25,7 @@ if [[ $(cat /etc/os-release | grep -m 1 ^"ID=") != *"alpine"* ]]; then echo Not
#AlpineVersionCheck #AlpineVersionCheck
if $SkipAlpineRelCheck ; then echo "Notice: Alpine releas check skipped" if $SkipAlpineRelCheck ; then echo "Notice: Alpine release check skipped"
elif [[ $(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}') != *"$SupportedAlpineVersion"* ]]; then printf "This Alpine Linux version is not supported by default,\nto continue set SkipAlpineRelCheck to true and check the targeted php version in the script\n" ;exit 1;fi elif [[ $(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}') != *"$SupportedAlpineVersion"* ]]; then printf "This Alpine Linux version is not supported by default,\nto continue set SkipAlpineRelCheck to true and check the targeted php version in the script\n" ;exit 1;fi
#Functions for menu/core use #Functions for menu/core use