From f60bb055a80419a94fa462b7ddd965a96362011c Mon Sep 17 00:00:00 2001 From: catborise Date: Mon, 27 Jun 2022 10:49:42 +0300 Subject: [PATCH 1/3] add almalinux support for installation --- dev/libvirt-bootstrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/libvirt-bootstrap.sh b/dev/libvirt-bootstrap.sh index f51c06c..8a3cdfe 100644 --- a/dev/libvirt-bootstrap.sh +++ b/dev/libvirt-bootstrap.sh @@ -111,7 +111,7 @@ __parse_version_string() { # enough. #------------------------------------------------------------------------------- __sort_release_files() { - KNOWN_RELEASE_FILES=$(echo "(arch|centos|debian|ubuntu|fedora|redhat|suse|\ + KNOWN_RELEASE_FILES=$(echo "(arch|centos|almalinux|rocky|debian|ubuntu|fedora|redhat|suse|\ mandrake|mandriva|gentoo|slackware|turbolinux|unitedlinux|lsb|system|\ os)(-|_)(release|version)" | sed -r 's:[[:space:]]::g') primary_release_files="" @@ -208,6 +208,7 @@ __gather_linux_system_info() { ;; arch ) n="Arch Linux" ;; centos ) n="CentOS" ;; + almalinux ) n="AlmaLinux" ;; debian ) n="Debian" ;; ubuntu ) n="Ubuntu" ;; fedora ) n="Fedora" ;; From a4baeae9340fa460840ebc2c63a329866de2510c Mon Sep 17 00:00:00 2001 From: catborise Date: Mon, 27 Jun 2022 11:17:21 +0300 Subject: [PATCH 2/3] update docker image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 489a7dd..fd89448 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage:focal-1.1.0 +FROM phusion/baseimage:jammy-1.0.0 EXPOSE 80 EXPOSE 6080 From f3d1c17a23b6ccb86946f6d918a2d2aef55b7475 Mon Sep 17 00:00:00 2001 From: catborise Date: Mon, 27 Jun 2022 11:17:58 +0300 Subject: [PATCH 3/3] update requirements --- conf/requirements.txt | 6 +++--- dev/requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index 7826c40..6d17fa3 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,13 +1,13 @@ Django==3.2.13 django_bootstrap5==21.2 django-icons==21.1 -django-login-required-middleware==0.7 +django-login-required-middleware==0.8 django-otp==1.1.3 django-qr-code==2.3.0 gunicorn==20.1.0 libsass==0.21.0 -libvirt-python==8.2.0 -lxml==4.8.0 +libvirt-python==8.4.0 +lxml==4.9.0 qrcode==7.3.1 rwlock==0.0.7 websockify==0.10.0 diff --git a/dev/requirements.txt b/dev/requirements.txt index cc28827..3e8a789 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -3,5 +3,5 @@ coverage==6.2 django-debug-toolbar==3.2.4 pycodestyle==2.8.0 pyflakes==2.4.0 -pylint==2.13.7 +pylint==2.13.9 yapf==0.32.0