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 <stephen@that.guru>
Cc: Daniel Axtens <dja@axtens.net>
Acked-by: Daniel Axtens <dja@axtens.net>
[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 <dja@axtens.net>

diff --git a/tools/docker/entrypoint.sh b/tools/docker/entrypoint.sh
index 997b87635a9c3337a65e1d7f9bb8c64d70c34841..afa8533356fa752fe8dd0e7c16ad0a2c99584b7d 100755 (executable)
--- 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