From: Stephen Finucane <stephen@that.guru>
Date: Sat, 6 Jul 2019 20:25:25 +0000 (+0100)
Subject: docker: *Actually* don't require rebuilding if unnecessary
X-Git-Tag: v2.2.0-rc1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fab75276b1ba2e065e1a6e0c2ed6dc1e19444f3;p=thirdparty%2Fpatchwork.git

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 <stephen@that.guru>
Fixes: 0b5b4e8c ("docker: Don't require rebuilding if unnecessary")
Cc: Daniel Axtens <dja@axtens.net>
Signed-off-by: Daniel Axtens <dja@axtens.net>
---

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"