Run update.sh

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>

26/apache/Dockerfile

@@ -15,7 +15,7 @@ RUN set -ex; \
  rm -rf /var/lib/apt/lists/*; \
  \
  mkdir -p /var/spool/cron/crontabs; \
- echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+ echo '*/5 * * * * occ-cron' > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
@@ -165,7 +165,8 @@ RUN set -ex; \
  apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
  rm -rf /var/lib/apt/lists/*
 
-COPY *.sh upgrade.exclude /
+COPY entrypoint.sh cron.sh upgrade.exclude /
+COPY occ occ-cron /usr/local/bin/
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]

26/apache/entrypoint.sh

@@ -11,14 +11,6 @@ directory_empty() {
  [ -z "$(ls -A "$1/")" ]
 }
 
-run_as() {
- if [ "$(id -u)" = 0 ]; then
- su -p "$user" -s /bin/sh -c "$1"
- else
- sh -c "$1"
- fi
-}
-
 # Execute all executable files in a given directory in alphanumeric order
 run_path() {
  local hook_folder_path="/docker-entrypoint-hooks.d/$1"
@@ -32,15 +24,19 @@ run_path() {
  echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
 
  (
- find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -print | sort | while read -r script_file_path; do
+ find "${hook_folder_path}" -maxdepth 1 -type f -iname '*.sh' -print | sort | while read -r script_file_path; do
  if ! [ -x "${script_file_path}" ]; then
  echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
  continue
  fi
 
  echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
 
- run_as "${script_file_path}" || return_code="$?"
+ if [ "$(id -u)" = 0 ]; then
+ su -p "$user" -s /bin/sh "${script_file_path}" || return_code="$?"
+ else
+ "${script_file_path}" || return_code="$?"
+ fi
 
  if [ "${return_code}" -ne "0" ]; then
  echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
@@ -163,7 +159,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  exit 1
  fi
  echo "Upgrading nextcloud from $installed_version ..."
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
+ occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
  fi
  if [ "$(id -u)" = 0 ]; then
  rsync_options="-rlDog --chown $user:$group"
@@ -225,7 +221,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  echo "Starting nextcloud installation"
  max_retries=10
  try=0
- until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+ until eval "occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
  do
  echo "Retrying install..."
  try=$((try+1))
@@ -240,7 +236,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  NC_TRUSTED_DOMAIN_IDX=1
  for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
  DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
- run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+ occ config:system:set trusted_domains "$NC_TRUSTED_DOMAIN_IDX" --value="$DOMAIN"
  NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
  done
  fi
@@ -254,9 +250,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  else
  run_path pre-upgrade
 
- run_as 'php /var/www/html/occ upgrade'
+ occ upgrade
 
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
+ occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
  echo "The following apps have been disabled:"
  diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
  rm -f /tmp/list_before /tmp/list_after
@@ -269,7 +265,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 
  # Update htaccess after init if requested
  if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ] && [ "$installed_version" != "0.0.0.0" ]; then
- run_as 'php /var/www/html/occ maintenance:update:htaccess'
+ occ maintenance:update:htaccess
  fi
  ) 9> /var/www/html/nextcloud-init-sync.lock
 

26/apache/occ

@@ -0,0 +1,14 @@
+#!/bin/sh
+set -eu
+
+[ -e /var/www/html/occ ] || { echo "Unable to run \`occ\`: No such file or directory" >&2 ; exit 1 ; }
+[ -f /var/www/html/occ ] || { echo "Unable to run \`occ\`: Not a file" >&2 ; exit 1 ; }
+
+RUN_AS="$(stat -c %U /var/www/html/occ)"
+[ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ\`: Failed to determine www-data user" >&2 ; exit 1 ; }
+
+if [ "$(id -u)" = 0 ]; then
+ exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/occ -- "$@"' -- '/bin/sh' "$@"
+else
+ exec php -f /var/www/html/occ -- "$@"
+fi

26/apache/occ-cron

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -eu
+
+if [ "$(occ status 2> /dev/null | sed -ne 's/^ - installed: \(.*\)$/\1/p')" != "true" ]; then
+ echo "Nextcloud is not installed - cronjobs are not available" >&2
+ exit 1
+fi
+
+[ -e /var/www/html/cron.php ] || { echo "Unable to run \`occ-cron\`: No such file or directory" >&2 ; exit 1 ; }
+[ -f /var/www/html/cron.php ] || { echo "Unable to run \`occ-cron\`: Not a file" >&2 ; exit 1 ; }
+
+RUN_AS="$(stat -c %U /var/www/html/cron.php)"
+[ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
+
+if [ "$(id -u)" = 0 ]; then
+ exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
+else
+ exec php -f /var/www/html/cron.php
+fi

26/fpm-alpine/Dockerfile

@@ -10,7 +10,7 @@ RUN set -ex; \
  ; \
  \
  rm /var/spool/cron/crontabs/root; \
- echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+ echo '*/5 * * * * occ-cron' > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
@@ -134,7 +134,8 @@ RUN set -ex; \
  chmod +x /usr/src/nextcloud/occ; \
  apk del --no-network .fetch-deps
 
-COPY *.sh upgrade.exclude /
+COPY entrypoint.sh cron.sh upgrade.exclude /
+COPY occ occ-cron /usr/local/bin/
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]

26/fpm-alpine/entrypoint.sh

@@ -11,14 +11,6 @@ directory_empty() {
  [ -z "$(ls -A "$1/")" ]
 }
 
-run_as() {
- if [ "$(id -u)" = 0 ]; then
- su -p "$user" -s /bin/sh -c "$1"
- else
- sh -c "$1"
- fi
-}
-
 # Execute all executable files in a given directory in alphanumeric order
 run_path() {
  local hook_folder_path="/docker-entrypoint-hooks.d/$1"
@@ -32,15 +24,19 @@ run_path() {
  echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
 
  (
- find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -print | sort | while read -r script_file_path; do
+ find "${hook_folder_path}" -maxdepth 1 -type f -iname '*.sh' -print | sort | while read -r script_file_path; do
  if ! [ -x "${script_file_path}" ]; then
  echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
  continue
  fi
 
  echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
 
- run_as "${script_file_path}" || return_code="$?"
+ if [ "$(id -u)" = 0 ]; then
+ su -p "$user" -s /bin/sh "${script_file_path}" || return_code="$?"
+ else
+ "${script_file_path}" || return_code="$?"
+ fi
 
  if [ "${return_code}" -ne "0" ]; then
  echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
@@ -163,7 +159,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  exit 1
  fi
  echo "Upgrading nextcloud from $installed_version ..."
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
+ occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
  fi
  if [ "$(id -u)" = 0 ]; then
  rsync_options="-rlDog --chown $user:$group"
@@ -225,7 +221,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  echo "Starting nextcloud installation"
  max_retries=10
  try=0
- until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+ until eval "occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
  do
  echo "Retrying install..."
  try=$((try+1))
@@ -240,7 +236,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  NC_TRUSTED_DOMAIN_IDX=1
  for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
  DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
- run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+ occ config:system:set trusted_domains "$NC_TRUSTED_DOMAIN_IDX" --value="$DOMAIN"
  NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
  done
  fi
@@ -254,9 +250,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  else
  run_path pre-upgrade
 
- run_as 'php /var/www/html/occ upgrade'
+ occ upgrade
 
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
+ occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
  echo "The following apps have been disabled:"
  diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
  rm -f /tmp/list_before /tmp/list_after
@@ -269,7 +265,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 
  # Update htaccess after init if requested
  if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ] && [ "$installed_version" != "0.0.0.0" ]; then
- run_as 'php /var/www/html/occ maintenance:update:htaccess'
+ occ maintenance:update:htaccess
  fi
  ) 9> /var/www/html/nextcloud-init-sync.lock
 

26/fpm-alpine/occ

@@ -0,0 +1,14 @@
+#!/bin/sh
+set -eu
+
+[ -e /var/www/html/occ ] || { echo "Unable to run \`occ\`: No such file or directory" >&2 ; exit 1 ; }
+[ -f /var/www/html/occ ] || { echo "Unable to run \`occ\`: Not a file" >&2 ; exit 1 ; }
+
+RUN_AS="$(stat -c %U /var/www/html/occ)"
+[ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ\`: Failed to determine www-data user" >&2 ; exit 1 ; }
+
+if [ "$(id -u)" = 0 ]; then
+ exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/occ -- "$@"' -- '/bin/sh' "$@"
+else
+ exec php -f /var/www/html/occ -- "$@"
+fi

26/fpm-alpine/occ-cron

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -eu
+
+if [ "$(occ status 2> /dev/null | sed -ne 's/^ - installed: \(.*\)$/\1/p')" != "true" ]; then
+ echo "Nextcloud is not installed - cronjobs are not available" >&2
+ exit 1
+fi
+
+[ -e /var/www/html/cron.php ] || { echo "Unable to run \`occ-cron\`: No such file or directory" >&2 ; exit 1 ; }
+[ -f /var/www/html/cron.php ] || { echo "Unable to run \`occ-cron\`: Not a file" >&2 ; exit 1 ; }
+
+RUN_AS="$(stat -c %U /var/www/html/cron.php)"
+[ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
+
+if [ "$(id -u)" = 0 ]; then
+ exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/cron.php' -- '/bin/sh'
+else
+ exec php -f /var/www/html/cron.php
+fi

26/fpm/Dockerfile

@@ -15,7 +15,7 @@ RUN set -ex; \
  rm -rf /var/lib/apt/lists/*; \
  \
  mkdir -p /var/spool/cron/crontabs; \
- echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
+ echo '*/5 * * * * occ-cron' > /var/spool/cron/crontabs/www-data
 
 # install the PHP extensions we need
 # see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
@@ -150,7 +150,8 @@ RUN set -ex; \
  apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
  rm -rf /var/lib/apt/lists/*
 
-COPY *.sh upgrade.exclude /
+COPY entrypoint.sh cron.sh upgrade.exclude /
+COPY occ occ-cron /usr/local/bin/
 COPY config/* /usr/src/nextcloud/config/
 
 ENTRYPOINT ["/entrypoint.sh"]

26/fpm/entrypoint.sh

@@ -11,14 +11,6 @@ directory_empty() {
  [ -z "$(ls -A "$1/")" ]
 }
 
-run_as() {
- if [ "$(id -u)" = 0 ]; then
- su -p "$user" -s /bin/sh -c "$1"
- else
- sh -c "$1"
- fi
-}
-
 # Execute all executable files in a given directory in alphanumeric order
 run_path() {
  local hook_folder_path="/docker-entrypoint-hooks.d/$1"
@@ -32,15 +24,19 @@ run_path() {
  echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
 
  (
- find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -print | sort | while read -r script_file_path; do
+ find "${hook_folder_path}" -maxdepth 1 -type f -iname '*.sh' -print | sort | while read -r script_file_path; do
  if ! [ -x "${script_file_path}" ]; then
  echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
  continue
  fi
 
  echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
 
- run_as "${script_file_path}" || return_code="$?"
+ if [ "$(id -u)" = 0 ]; then
+ su -p "$user" -s /bin/sh "${script_file_path}" || return_code="$?"
+ else
+ "${script_file_path}" || return_code="$?"
+ fi
 
  if [ "${return_code}" -ne "0" ]; then
  echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
@@ -163,7 +159,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  exit 1
  fi
  echo "Upgrading nextcloud from $installed_version ..."
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
+ occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
  fi
  if [ "$(id -u)" = 0 ]; then
  rsync_options="-rlDog --chown $user:$group"
@@ -225,7 +221,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  echo "Starting nextcloud installation"
  max_retries=10
  try=0
- until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
+ until eval "occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ]
  do
  echo "Retrying install..."
  try=$((try+1))
@@ -240,7 +236,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  NC_TRUSTED_DOMAIN_IDX=1
  for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
  DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
- run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+ occ config:system:set trusted_domains "$NC_TRUSTED_DOMAIN_IDX" --value="$DOMAIN"
  NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
  done
  fi
@@ -254,9 +250,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
  else
  run_path pre-upgrade
 
- run_as 'php /var/www/html/occ upgrade'
+ occ upgrade
 
- run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
+ occ app:list | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
  echo "The following apps have been disabled:"
  diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
  rm -f /tmp/list_before /tmp/list_after
@@ -269,7 +265,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 
  # Update htaccess after init if requested
  if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ] && [ "$installed_version" != "0.0.0.0" ]; then
- run_as 'php /var/www/html/occ maintenance:update:htaccess'
+ occ maintenance:update:htaccess
  fi
  ) 9> /var/www/html/nextcloud-init-sync.lock
 

26/fpm/occ

@@ -0,0 +1,14 @@
+#!/bin/sh
+set -eu
+
+[ -e /var/www/html/occ ] || { echo "Unable to run \`occ\`: No such file or directory" >&2 ; exit 1 ; }
+[ -f /var/www/html/occ ] || { echo "Unable to run \`occ\`: Not a file" >&2 ; exit 1 ; }
+
+RUN_AS="$(stat -c %U /var/www/html/occ)"
+[ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ\`: Failed to determine www-data user" >&2 ; exit 1 ; }
+
+if [ "$(id -u)" = 0 ]; then
+ exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -f /var/www/html/occ -- "$@"' -- '/bin/sh' "$@"
+else
+ exec php -f /var/www/html/occ -- "$@"
+fi