diff options
| author | Stephen Finucane <stephen@that.guru> | 2019-07-06 21:25:25 +0100 |
|---|---|---|
| committer | Daniel Axtens <dja@axtens.net> | 2019-08-21 17:34:54 +1000 |
| commit | 0fab75276b1ba2e065e1a6e0c2ed6dc1e19444f3 (patch) | |
| tree | 17c6147a92e1aea2bcc65656a7ffc6340dc7b862 | |
| parent | b2d22fc59ba01a4d21fbc0e038739252aa7dfc3b (diff) | |
| download | patchwork-0fab75276b1ba2e065e1a6e0c2ed6dc1e19444f3.tar patchwork-0fab75276b1ba2e065e1a6e0c2ed6dc1e19444f3.tar.gz | |
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>
| -rwxr-xr-x | tools/docker/entrypoint.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/docker/entrypoint.sh b/tools/docker/entrypoint.sh index 32f7132..d2b094b 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" |