Preparation for 0.19.3

Merge pull request #180 from ScanPlusGmbH/fix-179
Fix #179 'libc not found'
2019-11-11 10:27:55 +01:00 · 2019-11-11 10:21:32 +01:00 · 2019-11-11 08:53:11 +01:00 · 2019-11-11 08:29:47 +01:00 · 2019-11-06 10:24:15 +01:00 · 2019-11-01 14:20:20 +01:00
3 changed files with 6 additions and 4 deletions
--- a/6
+++ b/6
@ -16,9 +16,9 @@ RUN apk add --no-cache \

 WORKDIR /install

-RUN pip install --prefix="/install" --install-option="--prefix=/install" \
+RUN pip install --prefix="/install" --no-warn-script-location \
 # gunicorn is used for launching netbox
-      gunicorn \
+      'gunicorn<20.0.0' \
      greenlet \
      eventlet \
 # napalm is used for gathering information from network devices
@ -30,7 +30,7 @@ RUN pip install --prefix="/install" --install-option="--prefix=/install" \

 ARG NETBOX_PATH
 COPY ${NETBOX_PATH}/requirements.txt /
-RUN pip install --prefix="/install" --install-option="--prefix=/install" -r /requirements.txt
+RUN pip install --prefix="/install" --no-warn-script-location -r /requirements.txt

 ###
 # Main stage
--- a/2
+++ b/2
@ -1 +1 @@
-0.19.2
+0.19.3
--- a/configuration/configuration.py
+++ b/configuration/configuration.py
@ -37,6 +37,8 @@ DATABASE = {
                                                         # PostgreSQL password
    'HOST': os.environ.get('DB_HOST', 'localhost'),      # Database server
    'PORT': os.environ.get('DB_PORT', ''),               # Database port (leave blank for default)
+    'CONN_MAX_AGE': int(os.environ.get('DB_CONN_MAX_AGE', '300')), 
+                                                         # Database connection persistence
 }

 # This key is used for secure generation of random numbers and strings. It must never be exposed outside of this file.
Author	SHA1	Message	Date
Tobias Genannt	c790ce5953	Preparation for 0.19.3	2019-11-11 10:27:55 +01:00
Tobias Genannt	cf7aef31e2	Merge pull request #180 from ScanPlusGmbH/fix-179 Fix #179 'libc not found'	2019-11-11 10:21:32 +01:00
Tobias Genannt	feb810ab27	Fix #179 'libc not found' Gunicorn version 20 crashes in this docker image. So for now use a version <20.	2019-11-11 08:53:11 +01:00
Tobias Genannt	3f2fe54bfd	Merge pull request #176 from sdktr/patch-1 Add CONN_MAX_AGE to database connection settings	2019-11-11 08:29:47 +01:00
Stefan de Kooter	773ec630b4	Add CONN_MAX_AGE to database connection settings Defaulting to 300 seconds for the database connection to avoid new connection setup roundtrip on consecutive requests	2019-11-06 10:24:15 +01:00
Tobias Genannt	8d71d2f973	Merge pull request #175 from ScanPlusGmbH/optimze-pip-install Optimize pip install command	2019-11-01 14:20:20 +01:00
Tobias Genannt	f9662a1e4b	Optimize pip install command As mentioned by @sdktr the "--install-option" is redundant. The added "--no-warn-script-location" is used to silence warnings when installing into a directory that is not on $PATH.	2019-10-31 10:11:33 +01:00
 @ -1 +1 @@
 .19.2
 .19.3