Skip to content

Commit 4356d86

Browse files
authored
Merge pull request #76 from networktocode/dga-fix-deps-redis
Fix for Netbox issue 4910
2 parents 66ad9ab + 0b8aac0 commit 4356d86

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

development/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ RUN pip install --upgrade pip\
1313
# -------------------------------------------------------------------------------------
1414
# Install NetBox
1515
# -------------------------------------------------------------------------------------
16+
# Remove redis==3.4.1 from the requirements.txt file as a workaround to #4910
17+
# https://github.com/netbox-community/netbox/issues/4910, required for version 2.8.8 and earlier
1618
RUN git clone --single-branch --branch ${netbox_ver} https://github.com/netbox-community/netbox.git /opt/netbox/ && \
1719
cd /opt/netbox/ && \
20+
sed -i '/^redis\=\=/d' /opt/netbox/requirements.txt && \
1821
pip install -r /opt/netbox/requirements.txt
1922

2023
# Make the django-debug-toolbar always visible when DEBUG is enabled,

netbox_onboarding/onboard.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,6 @@ def check_if_device_already_exist(self):
562562

563563
def ensure_device(self):
564564
"""Ensure that the device represented by the DevNetKeeper exists in the NetBox system."""
565-
566565
# Only check the device role and device type if the device do not exist already
567566
if not self.check_if_device_already_exist():
568567
self.ensure_device_type()

0 commit comments

Comments
 (0)