From 2b3f8317491b4a6eb7c6ce8efe596579218c4c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ma=CC=88der?= Date: Tue, 14 Aug 2018 10:08:34 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Don't=20lock=20Django=20to=20explic?= =?UTF-8?q?it=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... but rather use the same definition that is currently used in Netbox's `requirements.txt`. --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a65b33e..fd31ad3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,11 +22,10 @@ RUN pip install \ napalm \ # ruamel is used in startup_scripts ruamel.yaml \ -# if the Django package is not installed here to this pinned version -# django-rq will install the latest version (currently 2.1) -# then, when the requirements.txt of netbox is run, it will be -# uninstalled because it currently causes problems with netbox - Django==2.0.8 \ +# pinning django to the version required by netbox +# adding it here, to install the correct version of +# django-rq + 'Django>=1.11,<2.1' \ # django-rq is used for webhooks django-rq