Merge pull request #3013 from jumpserver/dev

Dev

apps/settings/forms.py

@@ -40,8 +40,8 @@ class BaseForm(forms.Form):
                 field = self.fields[name]
                 if isinstance(field.widget, forms.PasswordInput) and not value:
                     continue
-                if value == getattr(settings, name):
-                    continue
+                # if value == getattr(settings, name):
+                #     continue
 
                 encrypted = True if isinstance(field, FormEncryptMixin) else False
                 try:

requirements/alpine_requirements.txt

@@ -1 +1 @@
-tiff-dev jpeg-dev zlib-dev freetype-dev lcms-dev libwebp-dev tcl-dev tk-dev python3-dev libressl-dev openldap-dev cyrus-sasl-dev krb5-dev sshpass postgresql-dev mariadb-dev sqlite-dev libffi-dev openssh-client
+tiff-dev jpeg-dev zlib-dev freetype-dev lcms-dev libwebp-dev tcl-dev tk-dev python3-dev libressl-dev openldap-dev cyrus-sasl-dev krb5-dev sshpass postgresql-dev mariadb-dev sqlite-dev libffi-dev openssh-client gcc libc-dev linux-headers make autoconf