diff --git a/Dockerfile b/Dockerfile index 570b0f4..ff4197a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,4 +20,3 @@ COPY main.py /app/main.py COPY lib /app/lib/ EXPOSE 8090 ENTRYPOINT ["/.venv/bin/python", "/app/main.py"] -#ENTRYPOINT exec /app/.venv/bin/python /app/main.py --docker \ No newline at end of file diff --git a/create_docker.py b/create_docker.py index 283269d..c094235 100644 --- a/create_docker.py +++ b/create_docker.py @@ -2,8 +2,11 @@ from lib.definitions import app_version, app_title import subprocess import os +server = 'gitea.am-td.de' +server_user = 'alexander' + if os.getuid() == 0: - subprocess.run(["docker", "build", "-t", f"{app_title.lower()}:{app_version}", "."]) + subprocess.run(["docker", "build", "-t", f"{server}/{server_user}/{app_title.lower()}:{app_version}", "."]) if input("docker-compose erstellen j=JA") == "j": userfolder = input("Pfad für Benutzerdaten /users:") backupfolder = input("Pfad für Backupdaten /backup:") @@ -11,7 +14,7 @@ if os.getuid() == 0: docker_compose_content = f''' services: zeiterfassung: - image: {app_title.lower()}:{app_version.lower()} + image: {server}/{server_user}/{app_title.lower()}:{app_version.lower()} restart: always ports: - 8090:8090 diff --git a/docker-compose.yml b/docker-compose.yml index 21eafa0..cf14b60 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,13 @@ + services: zeiterfassung: - image: zeiterfassung:0.0.0 + image: gitea.am-td.de/alexander/zeiterfassung:0.0.0 restart: always ports: - 8090:8090 environment: - PYTHONUNBUFFERED=1 volumes: - - /home/alexander/Dokumente/Python/Zeiterfassung/docker-work/users:/users - - /home/alexander/Dokumente/Python/Zeiterfassung/docker-work/backup:/backup - - /home/alexander/Dokumente/Python/Zeiterfassung/docker-work/settings:/settings \ No newline at end of file + - ./docker-work/users:/users + - ./docker-work/backup:/backup + - ./docker-work/settings:/settings \ No newline at end of file diff --git a/lib/definitions.py b/lib/definitions.py index 80a24c0..f8a4747 100644 --- a/lib/definitions.py +++ b/lib/definitions.py @@ -6,7 +6,7 @@ from pathlib import Path import hashlib app_title = "Zeiterfassung" -app_version = "0.0.0" +app_version = "beta-2025.0.1" # Standardpfade