From 24f751774bfd36e31339da9336ac63a69035bad2 Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 27 Aug 2024 10:45:51 +0300 Subject: [PATCH 1/9] update requirements --- conf/requirements.txt | 12 ++++++------ dev/requirements.txt | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index 28dc05a4..f50656cd 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,18 +1,18 @@ -Django==4.2.14 +Django==4.2.15 django_bootstrap5==24.2 django-bootstrap-icons==0.9.0 django-login-required-middleware==0.9.0 -django-otp==1.5.0 +django-otp==1.5.2 django-qr-code==4.1.0 django-auth-ldap==4.8.0 djangorestframework==3.15.2 drf-nested-routers==0.94.1 drf-yasg==1.21.7 eventlet==0.36.1 -gunicorn==22.0.0 +gunicorn==23.0.0 libsass==0.23.0 -libvirt-python==10.5.0 -lxml==5.2.2 +libvirt-python==10.6.0 +lxml==5.3.0 ldap3==2.9.1 markdown==3.6 #psycopg2-binary @@ -23,4 +23,4 @@ rwlock==0.0.7 tzdata websockify==0.12.0 whitenoise==6.7.0 -zipp==3.19.2 +zipp==3.20.1 diff --git a/dev/requirements.txt b/dev/requirements.txt index 92871bd3..d2b53549 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,9 +1,9 @@ -r ../conf/requirements.txt -coverage==7.6.0 +coverage==7.6.1 django-debug-toolbar==4.4.6 django-debug-toolbar-template-profiler -pycodestyle==2.12.0 +pycodestyle==2.12.1 pyflakes==3.2.0 pylint==3.2.6 yapf==0.40.2 -black==24.4.2 +black==24.8.0 From b55552f05a624e88e593bfe3099a36c24a88ddc8 Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 15 Oct 2024 16:37:21 +0300 Subject: [PATCH 2/9] update requirements --- conf/requirements.txt | 20 ++++++++++---------- dev/requirements.txt | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index f50656cd..1d8933a8 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,26 +1,26 @@ -Django==4.2.15 -django_bootstrap5==24.2 +Django==4.2.16 +django_bootstrap5==24.3 django-bootstrap-icons==0.9.0 django-login-required-middleware==0.9.0 -django-otp==1.5.2 +django-otp==1.5.4 django-qr-code==4.1.0 -django-auth-ldap==4.8.0 +django-auth-ldap==5.0.0 djangorestframework==3.15.2 drf-nested-routers==0.94.1 drf-yasg==1.21.7 -eventlet==0.36.1 +eventlet==0.37.0 gunicorn==23.0.0 libsass==0.23.0 -libvirt-python==10.6.0 +libvirt-python==10.8.0 lxml==5.3.0 ldap3==2.9.1 markdown==3.6 #psycopg2-binary -python-engineio==4.9.1 -python-socketio==5.11.3 -qrcode==7.4.2 +python-engineio==4.10.1 +python-socketio==5.11.4 +qrcode==8.0 rwlock==0.0.7 tzdata websockify==0.12.0 whitenoise==6.7.0 -zipp==3.20.1 +zipp==3.20.2 diff --git a/dev/requirements.txt b/dev/requirements.txt index d2b53549..94d1a8fc 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,9 +1,9 @@ -r ../conf/requirements.txt -coverage==7.6.1 +coverage==7.6.3 django-debug-toolbar==4.4.6 django-debug-toolbar-template-profiler pycodestyle==2.12.1 pyflakes==3.2.0 -pylint==3.2.6 +pylint==3.3.1 yapf==0.40.2 -black==24.8.0 +black==24.10.0 From 1a800b45358d65f4b8ea10099974a36790892058 Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 11 Mar 2025 10:38:38 +0300 Subject: [PATCH 3/9] update requirements --- conf/requirements.txt | 22 +++++++++++----------- dev/requirements.txt | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index 1d8933a8..d4237496 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,26 +1,26 @@ -Django==4.2.16 -django_bootstrap5==24.3 +Django==4.2.20 +django_bootstrap5==25.1 django-bootstrap-icons==0.9.0 django-login-required-middleware==0.9.0 django-otp==1.5.4 django-qr-code==4.1.0 -django-auth-ldap==5.0.0 +django-auth-ldap==5.1.0 djangorestframework==3.15.2 drf-nested-routers==0.94.1 -drf-yasg==1.21.7 -eventlet==0.37.0 +drf-yasg==1.21.10 +eventlet==0.39.1 gunicorn==23.0.0 libsass==0.23.0 -libvirt-python==10.8.0 -lxml==5.3.0 +libvirt-python==11.1.0 +lxml==5.3.1 ldap3==2.9.1 markdown==3.6 #psycopg2-binary -python-engineio==4.10.1 -python-socketio==5.11.4 +python-engineio==4.11.2 +python-socketio==5.12.1 qrcode==8.0 rwlock==0.0.7 tzdata websockify==0.12.0 -whitenoise==6.7.0 -zipp==3.20.2 +whitenoise==6.9.0 +zipp==3.21.0 diff --git a/dev/requirements.txt b/dev/requirements.txt index 94d1a8fc..00ceebc3 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,9 +1,9 @@ -r ../conf/requirements.txt -coverage==7.6.3 -django-debug-toolbar==4.4.6 +coverage==7.6.12 +django-debug-toolbar==5.0.1 django-debug-toolbar-template-profiler pycodestyle==2.12.1 pyflakes==3.2.0 -pylint==3.3.1 -yapf==0.40.2 -black==24.10.0 +pylint==3.3.5 +yapf==0.43.0 +black==25.1.0 From 8c4f1d9fe8015744a51b6479e1ed699938e5db2c Mon Sep 17 00:00:00 2001 From: fangebee <78966083+fangebee@users.noreply.github.com> Date: Thu, 13 Mar 2025 18:17:21 +0100 Subject: [PATCH 4/9] Workaround issue #663 do not confuse a network volume with a network interface --- vrtManager/instance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vrtManager/instance.py b/vrtManager/instance.py index 9cbe83e1..e9659a5e 100644 --- a/vrtManager/instance.py +++ b/vrtManager/instance.py @@ -631,7 +631,7 @@ def get_bootorder(self): dev_type = dev.get("type") dev_device = dev.get("device") - if dev_type == "file": + if dev_type == "file" or (dev_device == "disk" and dev_type == "network"): dev_target = dev.find("target").get("dev") elif dev_type == "network": From f26fa3d05060ee68fb0a163f4f8d1d29ef4eda77 Mon Sep 17 00:00:00 2001 From: fangebee <78966083+fangebee@users.noreply.github.com> Date: Fri, 14 Mar 2025 10:31:40 +0100 Subject: [PATCH 5/9] Detect RDB pools too --- vrtManager/storage.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vrtManager/storage.py b/vrtManager/storage.py index 03024f90..0037de22 100644 --- a/vrtManager/storage.py +++ b/vrtManager/storage.py @@ -34,6 +34,8 @@ def get_pool_by_target(self, target): stg = wvmStorage(self.host, self.login, self.passwd, self.conn, pool_name) if stg.get_target_path() == target: return self.get_storage(pool_name) + if stg.get_type() == "rbd" and stg.get_source_name() == target: + return self.get_storage(pool_name) return None def create_storage(self, stg_type, name, source, target): From 8bca7db917fcb16c91ed4e7c93adb15beb6e14bd Mon Sep 17 00:00:00 2001 From: Liang Suilong Date: Sun, 30 Mar 2025 10:33:51 +0800 Subject: [PATCH 6/9] crypt-r replaces crypt stdlib, support python-3.13 --- conf/requirements.txt | 1 + instances/views.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index d4237496..bab331c3 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -24,3 +24,4 @@ tzdata websockify==0.12.0 whitenoise==6.9.0 zipp==3.21.0 +crypt-r==3.13.1 diff --git a/instances/views.py b/instances/views.py index 22e34e88..54b73afb 100755 --- a/instances/views.py +++ b/instances/views.py @@ -1,4 +1,4 @@ -import crypt +import crypt_r import json import os import re @@ -476,7 +476,7 @@ def set_root_pass(request, pk): if request.method == "POST": passwd = request.POST.get("passwd", None) if passwd: - passwd_hash = crypt.crypt(passwd, "$6$kgPoiREy") + passwd_hash = crypt_r.crypt(passwd, "$6$kgPoiREy") data = {"action": "password", "passwd": passwd_hash, "vname": instance.name} if instance.proxy.get_status() == 5: From 34f08fc555d551123c884f1b6671aee36ab6d52a Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 2 May 2025 10:06:09 +0300 Subject: [PATCH 7/9] update requirements --- conf/requirements.txt | 14 +++++++------- dev/requirements.txt | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index d4237496..ac343885 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -2,23 +2,23 @@ Django==4.2.20 django_bootstrap5==25.1 django-bootstrap-icons==0.9.0 django-login-required-middleware==0.9.0 -django-otp==1.5.4 +django-otp==1.6.0 django-qr-code==4.1.0 django-auth-ldap==5.1.0 -djangorestframework==3.15.2 +djangorestframework==3.16.0 drf-nested-routers==0.94.1 drf-yasg==1.21.10 eventlet==0.39.1 gunicorn==23.0.0 libsass==0.23.0 -libvirt-python==11.1.0 -lxml==5.3.1 +libvirt-python==11.2.0 +lxml==5.4.0 ldap3==2.9.1 markdown==3.6 #psycopg2-binary -python-engineio==4.11.2 -python-socketio==5.12.1 -qrcode==8.0 +python-engineio==4.12.0 +python-socketio==5.13.0 +qrcode==8.2 rwlock==0.0.7 tzdata websockify==0.12.0 diff --git a/dev/requirements.txt b/dev/requirements.txt index 00ceebc3..46506133 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,9 +1,9 @@ -r ../conf/requirements.txt -coverage==7.6.12 -django-debug-toolbar==5.0.1 +coverage==7.8.0 +django-debug-toolbar==5.2.0 django-debug-toolbar-template-profiler -pycodestyle==2.12.1 -pyflakes==3.2.0 -pylint==3.3.5 +pycodestyle==2.13.0 +pyflakes==3.3.2 +pylint==3.3.6 yapf==0.43.0 black==25.1.0 From 659a6edb730365ca3010c0eed579b27f1a01c712 Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 2 May 2025 10:23:51 +0300 Subject: [PATCH 8/9] update minimum python3 requirements. python3 >= 3.11 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f9069f5..341f059a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/retspen/webvirtcloud) # WebVirtCloud -###### Python 3.x & Django 4.2 LTS +###### Python >=3.11 & Django 4.2 LTS ## Features * QEMU/KVM Hypervisor Management From a56ce2a58f88b718730398d9e9d585c0c0ea5e78 Mon Sep 17 00:00:00 2001 From: lando814 <148553443+lando814@users.noreply.github.com> Date: Mon, 19 May 2025 17:21:29 +0200 Subject: [PATCH 9/9] ubdate base image updated base image from jammy to noble due to error message during docker build ERROR: No matching distribution found for crypt-r==3.13.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f86f479e..e2461278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage:jammy-1.0.1 +FROM phusion/baseimage:noble-1.0.2 EXPOSE 80 EXPOSE 6080