Merge Dev to Main (Bumped Apline version from 3.21 to 3.22) #7
@@ -7,7 +7,7 @@ pipeline {
|
|||||||
string defaultValue: '192.168.200.11', description: 'Proxy server for packages, when enabled', name: 'ProxyServer'
|
string defaultValue: '192.168.200.11', description: 'Proxy server for packages, when enabled', name: 'ProxyServer'
|
||||||
booleanParam description: 'will disable use of proxy server', name: 'DisProxy'
|
booleanParam description: 'will disable use of proxy server', name: 'DisProxy'
|
||||||
checkboxParameter(name: 'ImgVariantList', format: 'JSON', displayNodePath: "//Variants/Variant", valueNodePath: "//Variants/Variant", description: 'Select the variant(s) that should be build',
|
checkboxParameter(name: 'ImgVariantList', format: 'JSON', displayNodePath: "//Variants/Variant", valueNodePath: "//Variants/Variant", description: 'Select the variant(s) that should be build',
|
||||||
pipelineSubmitContent: '{"Variants": [{"Variant": "minimal"},{"Variant": "default"},{"Variant": "gitea"},{"Variant": "nginx"},{"Variant": "ddns"},{"Variant": "transfersh"},{"Variant": "iscsi"},{"Variant": "z2mqtt"},{"Variant": "nodered"},{"Variant": "nodejs"},{"Variant": "nextcloud"},{"Variant": "mqtt"},{"Variant": "hass"},{"Variant": "mailbackup"},{"Variant": "elkarbackupALP"},{"Variant": "heimdall"},{"Variant": "vouchproxy"},{"Variant": "freshrss"},{"Variant": "uptimekuma"},{"Variant": "kavita"}]}')
|
pipelineSubmitContent: '{"Variants": [{"Variant": "minimal"},{"Variant": "default"},{"Variant": "gitea"},{"Variant": "nginx"},{"Variant": "ddns"},{"Variant": "transfersh"},{"Variant": "iscsi"},{"Variant": "z2mqtt"},{"Variant": "nodered"},{"Variant": "nodejs"},{"Variant": "nextcloud"},{"Variant": "mqtt"},{"Variant": "mailbackup"},{"Variant": "heimdall"},{"Variant": "vouchproxy"},{"Variant": "freshrss"},{"Variant": "uptimekuma"},{"Variant": "kavita"}]}')
|
||||||
}
|
}
|
||||||
options {
|
options {
|
||||||
skipDefaultCheckout()
|
skipDefaultCheckout()
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
image:
|
image:
|
||||||
distribution: "alpinelinux"
|
distribution: "alpinelinux"
|
||||||
release: "3.21"
|
release: "3.22"
|
||||||
|
|
||||||
source:
|
source:
|
||||||
downloader: alpinelinux-http
|
downloader: alpinelinux-http
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ adduser -h /opt/kavita -D -G kavita -s /bin/sh kavita
|
|||||||
chown kavita: -R /opt/kavita
|
chown kavita: -R /opt/kavita
|
||||||
chmod +x /opt/kavita/Kavita
|
chmod +x /opt/kavita/Kavita
|
||||||
setcap 'cap_net_bind_service=+ep' /opt/kavita/Kavita
|
setcap 'cap_net_bind_service=+ep' /opt/kavita/Kavita
|
||||||
sed -i 's#\"Port\": 5000,#\"Port\": 80,#g' /opt/kavita/config/appsettings.json
|
sed -i 's#\"Port\": 5000,#\"Port\": 80,#g' /opt/kavita/config/appsettings-init.json
|
||||||
|
|
||||||
#Update script
|
#Update script
|
||||||
mv /opt/Setup/Scripts/UpdateKavita.sh /opt/UpdateKavita.sh
|
mv /opt/Setup/Scripts/UpdateKavita.sh /opt/UpdateKavita.sh
|
||||||
|
|||||||
33
Readme.md
33
Readme.md
@@ -37,7 +37,7 @@ This can be done on a privileged Debian CT (make sure to enable the Fuse, Nestin
|
|||||||
| esphome | Debian | ESPHome software to manage wifi-MCUs|
|
| esphome | Debian | ESPHome software to manage wifi-MCUs|
|
||||||
| postgresql | Debian | PostgreSQL server with pgAdmin|
|
| postgresql | Debian | PostgreSQL server with pgAdmin|
|
||||||
| linkwarden | Debian | inkwarden is an collaborative bookmark manager to collect, organize and preserve webpages.|
|
| linkwarden | Debian | inkwarden is an collaborative bookmark manager to collect, organize and preserve webpages.|
|
||||||
| elkarbackupALP `(Deprecated, Requires PHP 7.4)`| Alpine | ElkarBackup rsyncsnapshot server |
|
| elkarbackupALP `(Deprecated)`| Alpine | ElkarBackup rsyncsnapshot server `(Requires PHP 7.4)` |
|
||||||
| gitea | Alpine | Gitea server |
|
| gitea | Alpine | Gitea server |
|
||||||
| nginx | Alpine | Nginx server for reverse-proxy use |
|
| nginx | Alpine | Nginx server for reverse-proxy use |
|
||||||
| ddns | Alpine | DDNS client configured for OVH/OVH-Cloud |
|
| ddns | Alpine | DDNS client configured for OVH/OVH-Cloud |
|
||||||
@@ -48,7 +48,7 @@ This can be done on a privileged Debian CT (make sure to enable the Fuse, Nestin
|
|||||||
| nodejs | Alpine | Basic nodejs install with pm2 |
|
| nodejs | Alpine | Basic nodejs install with pm2 |
|
||||||
| nextcloud | Alpine | Nextcloud |
|
| nextcloud | Alpine | Nextcloud |
|
||||||
| mqtt | Alpine | Mosquitto mqtt broker |
|
| mqtt | Alpine | Mosquitto mqtt broker |
|
||||||
| hass `(Broken, Requires python 3.13)` | Alpine | HomeAssistant instance with HACS and mysql support |
|
| hass `(Unsupported & Broken)` | Alpine | HomeAssistant core instance with HACS and mysql support `(Due to Nabu Casa EOL on hass core, and Broken because python 3.13 is required)`|
|
||||||
| mailbackup | Alpine | Contains mail archive tools (MailBackup-sys) |
|
| mailbackup | Alpine | Contains mail archive tools (MailBackup-sys) |
|
||||||
| heimdall | Alpine | Heimdall, A application dashboard/launcher |
|
| heimdall | Alpine | Heimdall, A application dashboard/launcher |
|
||||||
| vouchproxy | Alpine | Vouch-proxy, A SSO solution for Nginx |
|
| vouchproxy | Alpine | Vouch-proxy, A SSO solution for Nginx |
|
||||||
@@ -56,32 +56,7 @@ This can be done on a privileged Debian CT (make sure to enable the Fuse, Nestin
|
|||||||
| uptimekuma | Alpine | Uptime Kuma a self-hosted monitoring tool. |
|
| uptimekuma | Alpine | Uptime Kuma a self-hosted monitoring tool. |
|
||||||
| kavita | Alpine | A self-hosted digital library which supports a vast array of file formats. |
|
| kavita | Alpine | A self-hosted digital library which supports a vast array of file formats. |
|
||||||
|
|
||||||
## TODO
|
(Unsupported and Broken containners are removed from the jenkins build config)
|
||||||
**Begin original list**
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
~Unifi~ Not supported in debian 11
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
**End original list**
|
|
||||||
|
|
||||||
|
|
||||||
# Container Setup
|
# Container Setup
|
||||||
@@ -230,6 +205,8 @@ lxc.mount.entry: /dev/ttyACM-Zwave dev/ttyACM-Zwave none bind,optional,create=fi
|
|||||||
* Set ssh port `sed -i -e '/Port 22/c\Port <PortNr>' /etc/ssh/sshd_config`
|
* Set ssh port `sed -i -e '/Port 22/c\Port <PortNr>' /etc/ssh/sshd_config`
|
||||||
|
|
||||||
## hass
|
## hass
|
||||||
|
|
||||||
|
**EOL Use Docker with HomeAssistant compose file instead**
|
||||||
* After first start of CT HomeAssistant will finish its installation this will take at least 10 minutes
|
* After first start of CT HomeAssistant will finish its installation this will take at least 10 minutes
|
||||||
* HomeAssistant available on http://`<ip>`:8123
|
* HomeAssistant available on http://`<ip>`:8123
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
self=$0
|
self=$0
|
||||||
|
|
||||||
Configurations="nextcloud freshrss heimdall mailbackup"
|
Configurations="nextcloud freshrss heimdall mailbackup"
|
||||||
SupportedAlpineVersion=3.21
|
SupportedAlpineVersion=3.22
|
||||||
NewPHPVer=84
|
NewPHPVer=84
|
||||||
SkipAlpineRelCheck=false
|
SkipAlpineRelCheck=false
|
||||||
|
|
||||||
@@ -26,7 +26,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 releas check skipped"
|
||||||
elif [[ $(grep "^VERSION_ID=" /etc/os-release | awk -F= '{print $2}') != *"$SupportedAlpineVersion"* ]]; then printf "This Alpine Linux 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
|
||||||
show_help () {
|
show_help () {
|
||||||
|
|||||||
29
Scripts/AlpineSetReleaseVersion.sh
Normal file
29
Scripts/AlpineSetReleaseVersion.sh
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#Goto ProjectRoot
|
||||||
|
cd "$( cd "$( dirname "$0" )" &> /dev/null && pwd )/.."
|
||||||
|
|
||||||
|
# Ask for version number
|
||||||
|
read -p "Enter the new AlpineLinux version: " AlpineVersion
|
||||||
|
|
||||||
|
# Confirm the version
|
||||||
|
while true; do
|
||||||
|
read -p "Update AlpineLinux version in scripts to '$AlpineVersion'. Continue? (yes/no): " yn
|
||||||
|
case "$yn" in
|
||||||
|
[Yy])
|
||||||
|
break
|
||||||
|
;;
|
||||||
|
[Nn])
|
||||||
|
echo "Version not confirmed. Exiting."
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Please answer yes or no."
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
#Update version in main container defintion (Alpine.yaml)
|
||||||
|
sed -i -e "0,/release: \"[^\"]*\"/s//release: \"$AlpineVersion\"/" CT-Build/Alpine.yaml
|
||||||
|
|
||||||
|
#Update version in the PHP setup/update script(AlpinePHPTool.sh)
|
||||||
|
sed -i -e "0,/^SupportedAlpineVersion=/s/^SupportedAlpineVersion=.*/SupportedAlpineVersion=$AlpineVersion/" Scripts/AlpinePHPTool.sh
|
||||||
Reference in New Issue
Block a user