Adding logfile at startup

ne20002 · ne20002 · commit b8d7d1fdba10 · 2025-08-30T14:34:59.000Z
diff --git a/2024.12/apache/Dockerfile b/2024.12/apache/Dockerfile
@@ -6,7 +6,6 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        sudo \
         rsync \
         bzip2 \
 # For mail() support
diff --git a/2024.12/apache/entrypoint.sh b/2024.12/apache/entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi
diff --git a/2024.12/fpm-alpine/entrypoint.sh b/2024.12/fpm-alpine/entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi
diff --git a/2024.12/fpm/Dockerfile b/2024.12/fpm/Dockerfile
@@ -6,7 +6,6 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        sudo \
         rsync \
         bzip2 \
 # For mail() support
diff --git a/2024.12/fpm/entrypoint.sh b/2024.12/fpm/entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi
diff --git a/2025.02-dev/apache/Dockerfile b/2025.02-dev/apache/Dockerfile
@@ -6,7 +6,6 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        sudo \
         rsync \
         bzip2 \
 # For mail() support
diff --git a/2025.02-dev/apache/entrypoint.sh b/2025.02-dev/apache/entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi
diff --git a/2025.02-dev/fpm-alpine/entrypoint.sh b/2025.02-dev/fpm-alpine/entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi
diff --git a/2025.02-dev/fpm/Dockerfile b/2025.02-dev/fpm/Dockerfile
@@ -6,7 +6,6 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        sudo \
         rsync \
         bzip2 \
 # For mail() support
diff --git a/2025.02-dev/fpm/entrypoint.sh b/2025.02-dev/fpm/entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi
diff --git a/2025.07-rc/apache/Dockerfile b/2025.07-rc/apache/Dockerfile
@@ -6,7 +6,6 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        sudo \
         rsync \
         bzip2 \
 # For mail() support
diff --git a/2025.07-rc/apache/entrypoint.sh b/2025.07-rc/apache/entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi
diff --git a/2025.07-rc/fpm-alpine/entrypoint.sh b/2025.07-rc/fpm-alpine/entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi
diff --git a/2025.07-rc/fpm/Dockerfile b/2025.07-rc/fpm/Dockerfile
@@ -6,7 +6,6 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        sudo \
         rsync \
         bzip2 \
 # For mail() support
diff --git a/2025.07-rc/fpm/entrypoint.sh b/2025.07-rc/fpm/entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -5,7 +5,6 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        sudo \
         rsync \
         bzip2 \
 # For mail() support
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -44,7 +44,7 @@ sh /setup_msmtp.sh
 
 # ensure we have a logfile writeable by www-data
 FRIENDICA_LOGFILE=${FRIENDICA_LOGFILE:-/var/www/html/friendica.log}
-if sudo -u www-data test -w "$(dirname "$FRIENDICA_LOGFILE")"; then
+if runuser --login www-data  --command "test -w \"$(dirname \"$FRIENDICA_LOGFILE\")"; then
    touch "$FRIENDICA_LOGFILE"
    chown www-data:www-data "$FRIENDICA_LOGFILE"
 fi

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ RUN set -ex; \`
`6`	`6`	`\`
`7`	`7`	`apt-get update; \`
`8`	`8`	`apt-get install -y --no-install-recommends \`
`9`		`- sudo \`
`10`	`9`	`rsync \`
`11`	`10`	`bzip2 \`
`12`	`11`	`# For mail() support`