From 74572cb5d8dca6b391b04749cbc4701a487e9421 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Tue, 2 Apr 2024 00:35:07 +0200
Subject: [PATCH] Upgrade Jameica, run Process as vorstand in container
---
verwaltung/docker_jameica/templates/Dockerfile | 8 ++++++--
verwaltung/docker_jameica/templates/jameica.conf | 2 +-
verwaltung/docker_jameica/templates/jameica.sh | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/verwaltung/docker_jameica/templates/Dockerfile b/verwaltung/docker_jameica/templates/Dockerfile
index f6c0b4ac..6e872df1 100644
--- a/verwaltung/docker_jameica/templates/Dockerfile
+++ b/verwaltung/docker_jameica/templates/Dockerfile
@@ -10,11 +10,15 @@ RUN set -ex; \
COPY jameica.conf /app/conf.d/
COPY jameica.sh /app/
+# Add User Vorstand
+RUN groupadd --gid 1000 vorstand \
+ && useradd --uid 1000 --gid 1000 -m vorstand
+
RUN set -ex; \
mkdir /jameica/; \
mkdir /jameica-data/; \
mkdir /jameica-work/; \
usermod -U -s /bin/bash -d /jameica-work/ -G root www-data; \
- chown www-data:www-data /app/jameica.sh; \
- chown www-data:www-data /jameica-work/; \
+ chown vorstand:vorstand /app/jameica.sh; \
+ chown vorstand:vorstand /jameica-work/; \
chmod +x /app/jameica.sh;
diff --git a/verwaltung/docker_jameica/templates/jameica.conf b/verwaltung/docker_jameica/templates/jameica.conf
index 22912f67..1e2873ea 100644
--- a/verwaltung/docker_jameica/templates/jameica.conf
+++ b/verwaltung/docker_jameica/templates/jameica.conf
@@ -1,4 +1,4 @@
[program:jameica]
command=/app/jameica.sh
autorestart=true
-user=www-data
+user=vorstand
diff --git a/verwaltung/docker_jameica/templates/jameica.sh b/verwaltung/docker_jameica/templates/jameica.sh
index 5cea358f..1fb8c4b9 100644
--- a/verwaltung/docker_jameica/templates/jameica.sh
+++ b/verwaltung/docker_jameica/templates/jameica.sh
@@ -8,4 +8,4 @@
cd "/jameica/"
archsuffix="64"
-LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=0 exec java -Djava.net.preferIPv4Stack=true -Xmx512m $_JCONSOLE -jar jameica-linux${archsuffix}.jar -f /jameica-data/ -p nopassword $@
+LIBOVERLAY_SCROLLBAR=0 GDK_NATIVE_WINDOWS=1 SWT_GTK3=1 exec java -Djava.net.preferIPv4Stack=true -Xmx512m $_JCONSOLE -jar jameica-linux${archsuffix}.jar -f /jameica-data/ -p nopassword $@
--
GitLab