From 0b5b4e8cb3d04e6f25ff73825d34632c61b353d1 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Sun, 24 Jun 2018 20:55:57 +0100 Subject: docker: Don't require rebuilding if unnecessary Now that we're pinning versions, we're going to see more frequent dependency version changes. Requiring a rebuild after every one of these is tiresome so don't force it and instead display a helpful message merely suggesting that a rebuild may be necessary. Signed-off-by: Stephen Finucane Cc: Daniel Axtens Acked-by: Daniel Axtens [dja: we're not currently pinning versions because I dropped that patch as it broke postgres. But this can stay - sfin has been asking for it for ages.] Signed-off-by: Daniel Axtens --- tools/docker/entrypoint.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/docker/entrypoint.sh b/tools/docker/entrypoint.sh index 997b876..afa8533 100755 --- a/tools/docker/entrypoint.sh +++ b/tools/docker/entrypoint.sh @@ -69,9 +69,10 @@ fi for x in /tmp/requirements-*.txt; do if ! cmp $x ~/patchwork/$(basename $x); then echo "A requirements file has changed." - echo "Please rebuild the patchwork image:" + echo "You may need to rebuild the patchwork image:" echo " docker-compose build web" - exit 1 + echo "" + diff -u $x ~/patchwork/$(basename $x) fi done -- cgit v1.2.3