Merge pull request #228 from nupplaphil/feat/locking

Use flock for the upgrade process

2023.04/apache/entrypoint.sh

@@ -69,6 +69,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     } > /usr/local/etc/php/conf.d/redis-session.ini
   fi
 
+  # If another process is syncing the html folder, wait for
+  # it to be done, then escape initialization.
+  (
+    if ! flock -n 9; then
+        # If we couldn't get it immediately, show a message, then wait for real
+        echo "Another process is initializing Nextcloud. Waiting..."
+        flock 9
+    fi
+
     installed_version="0.0.0.0"
     if [ -f /var/www/html/VERSION ]; then
       installed_version="$(cat /var/www/html/VERSION)"
@@ -170,6 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
+  ) 9> /var/www/html/nextcloud-init-sync.lock
 fi
 
 exec "$@"

2023.04/fpm-alpine/entrypoint.sh

@@ -69,6 +69,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     } > /usr/local/etc/php/conf.d/redis-session.ini
   fi
 
+  # If another process is syncing the html folder, wait for
+  # it to be done, then escape initialization.
+  (
+    if ! flock -n 9; then
+        # If we couldn't get it immediately, show a message, then wait for real
+        echo "Another process is initializing Nextcloud. Waiting..."
+        flock 9
+    fi
+
     installed_version="0.0.0.0"
     if [ -f /var/www/html/VERSION ]; then
       installed_version="$(cat /var/www/html/VERSION)"
@@ -170,6 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
+  ) 9> /var/www/html/nextcloud-init-sync.lock
 fi
 
 exec "$@"

2023.04/fpm/entrypoint.sh

@@ -69,6 +69,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     } > /usr/local/etc/php/conf.d/redis-session.ini
   fi
 
+  # If another process is syncing the html folder, wait for
+  # it to be done, then escape initialization.
+  (
+    if ! flock -n 9; then
+        # If we couldn't get it immediately, show a message, then wait for real
+        echo "Another process is initializing Nextcloud. Waiting..."
+        flock 9
+    fi
+
     installed_version="0.0.0.0"
     if [ -f /var/www/html/VERSION ]; then
       installed_version="$(cat /var/www/html/VERSION)"
@@ -170,6 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
+  ) 9> /var/www/html/nextcloud-init-sync.lock
 fi
 
 exec "$@"

2023.06-dev/apache/entrypoint.sh

@@ -69,6 +69,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     } > /usr/local/etc/php/conf.d/redis-session.ini
   fi
 
+  # If another process is syncing the html folder, wait for
+  # it to be done, then escape initialization.
+  (
+    if ! flock -n 9; then
+        # If we couldn't get it immediately, show a message, then wait for real
+        echo "Another process is initializing Nextcloud. Waiting..."
+        flock 9
+    fi
+
     installed_version="0.0.0.0"
     if [ -f /var/www/html/VERSION ]; then
       installed_version="$(cat /var/www/html/VERSION)"
@@ -170,6 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
+  ) 9> /var/www/html/nextcloud-init-sync.lock
 fi
 
 exec "$@"

2023.06-dev/fpm-alpine/entrypoint.sh

@@ -69,6 +69,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     } > /usr/local/etc/php/conf.d/redis-session.ini
   fi
 
+  # If another process is syncing the html folder, wait for
+  # it to be done, then escape initialization.
+  (
+    if ! flock -n 9; then
+        # If we couldn't get it immediately, show a message, then wait for real
+        echo "Another process is initializing Nextcloud. Waiting..."
+        flock 9
+    fi
+
     installed_version="0.0.0.0"
     if [ -f /var/www/html/VERSION ]; then
       installed_version="$(cat /var/www/html/VERSION)"
@@ -170,6 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
+  ) 9> /var/www/html/nextcloud-init-sync.lock
 fi
 
 exec "$@"

2023.06-dev/fpm/entrypoint.sh

@@ -69,6 +69,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     } > /usr/local/etc/php/conf.d/redis-session.ini
   fi
 
+  # If another process is syncing the html folder, wait for
+  # it to be done, then escape initialization.
+  (
+    if ! flock -n 9; then
+        # If we couldn't get it immediately, show a message, then wait for real
+        echo "Another process is initializing Nextcloud. Waiting..."
+        flock 9
+    fi
+
     installed_version="0.0.0.0"
     if [ -f /var/www/html/VERSION ]; then
       installed_version="$(cat /var/www/html/VERSION)"
@@ -170,6 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
+  ) 9> /var/www/html/nextcloud-init-sync.lock
 fi
 
 exec "$@"

docker-entrypoint.sh

@@ -69,6 +69,15 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
     } > /usr/local/etc/php/conf.d/redis-session.ini
   fi
 
+  # If another process is syncing the html folder, wait for
+  # it to be done, then escape initialization.
+  (
+    if ! flock -n 9; then
+        # If we couldn't get it immediately, show a message, then wait for real
+        echo "Another process is initializing Nextcloud. Waiting..."
+        flock 9
+    fi
+
     installed_version="0.0.0.0"
     if [ -f /var/www/html/VERSION ]; then
       installed_version="$(cat /var/www/html/VERSION)"
@@ -170,6 +179,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then
         echo "Upgrading finished"
       fi
     fi
+  ) 9> /var/www/html/nextcloud-init-sync.lock
 fi
 
 exec "$@"