Ubuntu 24.04

* update docker to 26.0.1
* cloudron-syslog needs to have correct perms for fifo socket
This commit is contained in:
Girish Ramakrishnan
2024-04-28 11:31:39 +02:00
parent cd5cae33ce
commit 8df97de8c6
5 changed files with 23 additions and 8 deletions
+7 -2
View File
@@ -117,8 +117,8 @@ fi
# Only --help works with mismatched ubuntu
ubuntu_version=$(lsb_release -rs)
if [[ "${ubuntu_version}" != "16.04" && "${ubuntu_version}" != "18.04" && "${ubuntu_version}" != "20.04" && "${ubuntu_version}" != "22.04" ]]; then
echo "Cloudron requires Ubuntu 18.04, 20.04, 22.04" > /dev/stderr
if [[ "${ubuntu_version}" != "16.04" && "${ubuntu_version}" != "18.04" && "${ubuntu_version}" != "20.04" && "${ubuntu_version}" != "22.04" && "${ubuntu_version}" != "24.04" ]]; then
echo "Cloudron requires Ubuntu 18.04, 20.04, 22.04, 24.04" > /dev/stderr
exit 1
fi
@@ -217,6 +217,11 @@ if ! grep -q avx /proc/cpuinfo; then
fi
fi
if [[ "${ubuntu_version}" == "24.04" ]] && ! vergte "${version}" "8.0.0"; then
echo "Cloudron >= 8.0.0 required for installation on Ubuntu ${ubuntu_version}"
exit 1
fi
if ! sourceTarballUrl=$(echo "${releaseJson}" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["info"]["sourceTarballUrl"])'); then
echo "No source code for version '${requestedVersion:-latest}'"
exit 1
+7
View File
@@ -67,6 +67,13 @@ case "${ubuntu_version}" in
python_package="python3.10"
nginx_package="nginx-full"
;;
24.04)
gpg_package="gpg"
mysql_package="mysql-server-8.0"
ntpd_package="systemd-timesyncd"
python_package="python3.12"
nginx_package="nginx-full"
;;
esac
apt-get -y install --no-install-recommends \
+2 -2
View File
@@ -82,8 +82,8 @@ systemctl stop unbound || true
systemctl enable --now systemd-resolved
# https://docs.docker.com/engine/installation/linux/ubuntulinux/
readonly docker_version="23.0.6"
readonly containerd_version="1.6.21-1"
readonly docker_version="26.0.1"
readonly containerd_version="1.6.31-1"
if ! which docker 2>/dev/null || [[ $(docker version --format {{.Client.Version}}) != "${docker_version}" ]]; then
log "installing/updating docker"