From 78c83579ee751b1f0215ff336f88656e9dc5fc7d Mon Sep 17 00:00:00 2001 From: DigiServer Developer Date: Thu, 20 Nov 2025 19:59:49 +0200 Subject: [PATCH] doker updated jor libre install --- Dockerfile | 1 + app/blueprints/admin.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7570a4c..6a72949 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,6 +41,7 @@ EXPOSE 5000 # Create a non-root user and grant sudo access for dependency installation RUN useradd -m -u 1000 appuser && \ chown -R appuser:appuser /app /docker-entrypoint.sh && \ + echo "Defaults:appuser !requiretty, !use_pty" >> /etc/sudoers && \ echo "appuser ALL=(ALL) NOPASSWD: /usr/bin/apt-get" >> /etc/sudoers && \ echo "appuser ALL=(ALL) NOPASSWD: /app/install_libreoffice.sh" >> /etc/sudoers && \ echo "appuser ALL=(ALL) NOPASSWD: /app/install_emoji_fonts.sh" >> /etc/sudoers && \ diff --git a/app/blueprints/admin.py b/app/blueprints/admin.py index ac75d14..e13b1c2 100644 --- a/app/blueprints/admin.py +++ b/app/blueprints/admin.py @@ -615,7 +615,7 @@ def install_libreoffice(): flash('Installation script not found', 'danger') return redirect(url_for('admin.dependencies')) - result = subprocess.run(['sudo', 'bash', script_path], + result = subprocess.run(['sudo', '-n', script_path], capture_output=True, text=True, timeout=300) @@ -652,7 +652,7 @@ def install_emoji_fonts(): flash('Installation script not found', 'danger') return redirect(url_for('admin.dependencies')) - result = subprocess.run(['sudo', 'bash', script_path], + result = subprocess.run(['sudo', '-n', script_path], capture_output=True, text=True, timeout=180)