From 45765316341de97dd9bc6e7d5a993232cc3bd0b3 Mon Sep 17 00:00:00 2001 From: misazr Date: Tue, 10 Oct 2017 09:56:10 +0200 Subject: [PATCH 1/2] Set right version of django rest framework --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 8a6273a..54b9a9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,8 @@ COPY docker/nginx.conf /etc/netbox-nginx/nginx.conf WORKDIR /opt/netbox/netbox +RUN pip3 install djangorestframework==3.6.4 + COPY docker/docker-entrypoint.sh /docker-entrypoint.sh ENTRYPOINT [ "/docker-entrypoint.sh" ] From 167f816b942f7f33d29372ddefafcc61afb163a0 Mon Sep 17 00:00:00 2001 From: misazr Date: Tue, 10 Oct 2017 11:14:16 +0200 Subject: [PATCH 2/2] Add description for library --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 54b9a9e..d0cb7f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,9 @@ RUN wget -q -O - "${URL}" | tar xz \ WORKDIR /opt/netbox RUN pip install -r requirements.txt +# Netbox requires v3.6.4 of django rest framework +# https://github.com/digitalocean/netbox/issues/1564 +RUN pip install djangorestframework==3.6.4 RUN ln -s configuration.docker.py /opt/netbox/netbox/netbox/configuration.py COPY docker/gunicorn_config.py /opt/netbox/ @@ -33,8 +36,6 @@ COPY docker/nginx.conf /etc/netbox-nginx/nginx.conf WORKDIR /opt/netbox/netbox -RUN pip3 install djangorestframework==3.6.4 - COPY docker/docker-entrypoint.sh /docker-entrypoint.sh ENTRYPOINT [ "/docker-entrypoint.sh" ]