From 0fab75276b1ba2e065e1a6e0c2ed6dc1e19444f3 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Sat, 6 Jul 2019 21:25:25 +0100 Subject: [PATCH] docker: *Actually* don't require rebuilding if unnecessary Because we were using 'set -e', we were erroring out as soon as something - a diff in this case - failed. Temporarily disable it for this one check. Signed-off-by: Stephen Finucane Fixes: 0b5b4e8c ("docker: Don't require rebuilding if unnecessary") Cc: Daniel Axtens Signed-off-by: Daniel Axtens --- tools/docker/entrypoint.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/docker/entrypoint.sh b/tools/docker/entrypoint.sh index 32f7132a..d2b094bd 100755 --- a/tools/docker/entrypoint.sh +++ b/tools/docker/entrypoint.sh @@ -67,6 +67,8 @@ EOF exit 1 fi +set +e + # check if we need to rebuild because requirements changed for x in /tmp/requirements-*.txt; do if ! cmp $x ~/patchwork/$(basename $x); then @@ -81,6 +83,8 @@ EOF fi done +set -e + # check if db is connected if ! test_db_connection; then echo "The database seems not to be connected, or the patchwork user is broken" -- 2.47.3