diff options
| author | Stephen Finucane <stephen@that.guru> | 2018-06-24 20:55:57 +0100 |
|---|---|---|
| committer | Daniel Axtens <dja@axtens.net> | 2018-08-26 16:58:21 +1000 |
| commit | 0b5b4e8cb3d04e6f25ff73825d34632c61b353d1 (patch) | |
| tree | 7ae9b36600b1a350af7e9e924aca02b3b6b20f17 | |
| parent | 4cfe75f061f5c40e0d36e082127991c3896d5cdb (diff) | |
| download | patchwork-0b5b4e8cb3d04e6f25ff73825d34632c61b353d1.tar patchwork-0b5b4e8cb3d04e6f25ff73825d34632c61b353d1.tar.gz | |
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>
| -rwxr-xr-x | tools/docker/entrypoint.sh | 5 |
1 files 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 |