Skip to content

Commit

Permalink
Merge pull request #1760 from nextcloud/feat/config-flag-init
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Jun 7, 2022
2 parents d11d42b + 83d5e72 commit ec3f7e5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ The install and update script is only triggered when a default command is used (

- `NEXTCLOUD_UPDATE` (default: `0`)

If you share your html folder with multiple docker containers, you might want to avoid multiple processes updating the same shared volume

- `NEXTCLOUD_INIT_LOCK` (not set by default) Set it to true to enable initialization locking. Other containers will wait for the current process to finish updating the html volume to continue.

If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:

- `REDIS_HOST` (not set by default) Name of Redis container
Expand Down
5 changes: 3 additions & 2 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
fi

# If another process is syncing the html folder, wait for
# it to be done, then escape initalization
# it to be done, then escape initalization.
# You need to define the NEXTCLOUD_INIT_LOCK environment variable
lock=/var/www/html/nextcloud-init-sync.lock
count=0
limit=10

if [ -f "$lock" ]; then
if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
do
count=$((count+1))
Expand Down

0 comments on commit ec3f7e5

Please sign in to comment.