diff --git a/verwaltung/docker_jameica/templates/Dockerfile b/verwaltung/docker_jameica/templates/Dockerfile index f6c0b4ac31eaa605a94a7492c0aa6172855ff3a5..6e872df18c1186d3aa2ece9e2fd94a75d9a71a30 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 22912f67d59e6692ed34b96c9f1ab893b6b42229..1e2873ea8425ff53b9558642ad3a311ac2b57952 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 5cea358fea7ba2de2e43a6b6cdb0ae9dc9c5e380..1fb8c4b90a2043208bf8696c54fe095085ee7592 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 $@