mirror of
https://github.com/nextcloud/docker.git
synced 2025-03-14 18:35:08 +01:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
b38b543dae
20 changed files with 80 additions and 80 deletions
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
exec busybox crond -f -l 0 -L /dev/stdout
|
||||
exec busybox crond -f -L /dev/stdout
|
||||
|
|
|
@ -24,17 +24,17 @@ run_path() {
|
|||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||
local return_code=0
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
if [ -z "$(ls -A "${hook_folder_path}")" ]; then
|
||||
echo "==> but the hook folder \"$(basename "${hook_folder_path}")\" is empty, so nothing to do"
|
||||
if ! [ -d "${hook_folder_path}" ]; then
|
||||
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||
return 0
|
||||
fi
|
||||
|
||||
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||
|
||||
(
|
||||
for script_file_path in "${hook_folder_path}/"*.sh; do
|
||||
if ! [ -x "${script_file_path}" ] && [ -f "${script_file_path}" ]; then
|
||||
echo "==> The script \"${script_file_path}\" in the folder \"${hook_folder_path}\" was skipping, because it didn't have the executable flag"
|
||||
find "${hook_folder_path}" -type f -maxdepth 1 -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
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue