From f15394fa5cc55690890c1953ebbb81e5a07ce536 Mon Sep 17 00:00:00 2001
From: Trenton H <797416+stumpylog@users.noreply.github.com>
Date: Thu, 12 Mar 2026 12:46:12 -0700
Subject: [PATCH] Fix: Removes the double exec that prevented migrations from
 running (#12317)

---
 docker/rootfs/etc/s6-overlay/s6-rc.d/init-migrations/run | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/init-migrations/run b/docker/rootfs/etc/s6-overlay/s6-rc.d/init-migrations/run
index 2635fa172..62d33cbe9 100755
--- a/docker/rootfs/etc/s6-overlay/s6-rc.d/init-migrations/run
+++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/init-migrations/run
@@ -10,12 +10,10 @@ cd "${PAPERLESS_SRC_DIR}"
 
 # The whole migrate, with flock, needs to run as the right user
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	exec s6-setlock -n "${data_dir}/migration_lock" python3 manage.py check --tag compatibility paperless
+	python3 manage.py check --tag compatibility paperless || exit 1
 	exec s6-setlock -n "${data_dir}/migration_lock" python3 manage.py migrate --skip-checks --no-input
 else
-	exec s6-setuidgid paperless \
-		s6-setlock -n "${data_dir}/migration_lock" \
-		python3 manage.py check --tag compatibility paperless
+	s6-setuidgid paperless python3 manage.py check --tag compatibility paperless  || exit 1
 	exec s6-setuidgid paperless \
 		s6-setlock -n "${data_dir}/migration_lock" \
 		python3 manage.py migrate --skip-checks --no-input