Docker Check verschoben

commandline_header angepasst

.gitignore

@@ -6,3 +6,4 @@ users/
 backup/
 Archiv/
 Docker/
+docker-work/

docker-compose.yml

@@ -6,6 +6,6 @@ services:
             - 8090:8090
         volumes:
             #- /home/alexander/Dokumente/Python/Zeiterfassung:/app
-            - /home/alexander/Dokumente/Python/Zeiterfassung/users-docker:/users
+            - /home/alexander/Dokumente/Python/Zeiterfassung/docker-work/users:/users
-            - /home/alexander/Dokumente/Python/Zeiterfassung/backup:/backup
+            - /home/alexander/Dokumente/Python/Zeiterfassung/docker-work/backup:/backup
-            - /home/alexander/Dokumente/Python/Zeiterfassung/settings:/settings
+            - /home/alexander/Dokumente/Python/Zeiterfassung/docker-work/settings:/settings

lib/definitions.py

@@ -3,7 +3,6 @@
 
 import os
 from pathlib import Path
-from lib.web_ui import is_docker
 import hashlib
 
 app_title = "Zeiterfassung"
@@ -11,6 +10,10 @@ app_version = "0.0.0"
 
 # Standardpfade
 
+def is_docker():
+    cgroup = Path('/proc/self/cgroup')
+    return Path('/.dockerenv').is_file() or (cgroup.is_file() and 'docker' in cgroup.read_text())
+
 if is_docker():
     scriptpath = "/settings"
     backupfolder = "/backup"

lib/users.py

@@ -14,9 +14,7 @@ import shutil
 import re
 
 from lib.definitions import userfolder, scriptpath, usersettingsfilename, photofilename, status_in, status_out, \
-    standard_adminsettings, standard_usersettings, va_file
+    standard_adminsettings, standard_usersettings, va_file, is_docker
-
-from web_ui import is_docker
 
 # Benutzerklasse
 

lib/web_ui.py

@@ -118,8 +118,4 @@ def login_is_valid(user = -1):
             else:
                 return False
         except:
-            return False
+            return False
-
-def is_docker():
-    cgroup = Path('/proc/self/cgroup')
-    return Path('/.dockerenv').is_file() or (cgroup.is_file() and 'docker' in cgroup.read_text())

main.py

@@ -15,7 +15,7 @@ import argparse
 
 from lib.web_ui import hash_password
 
-class Commandline_Header:
+def commandline_header():
     message_string = f"{app_title} {app_version}"
     underline = ""
     for i in range(len(message_string)):
@@ -36,8 +36,7 @@ def main():
 
     def startup_message():
 
-        Commandline_Header()
+        commandline_header()
-
         url_string = ""
         for i in list(app.urls):
             url_string += f"{i}, "
@@ -65,7 +64,7 @@ if __name__ in ("__main__", "__mp_main__"):
         backupfolder = "/backup"
 
     if args.admin_access:
-        Commandline_Header()
+        commandline_header()
         print("Lade Administrationseinstellungen")
         admin_settings = load_adminsettings()
         print("Geben Sie den neuen Benutzernamen für den Administrationsbenutzer an:")