Mascali
/
netbox-docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
184 Commits 2 Branches 56 Tags 1.4 MiB
Commit Graph

184 Commits

Author SHA1 Message Date
Demian 7b6842fca3
Merge pull request #83 from GnomeZworc/master 
Add auth-ldap-user-dn-template in ldap_config.py
 2018-08-05 12:42:34 +02:00
Demian 2aaf1ec18d
Merge branch 'master' into master 2018-08-05 12:20:01 +02:00
Demian 4fee1e3bf3
Merge pull request #85 from sts/patch-1 
Update docker-entrypoint.sh
 2018-08-05 12:17:05 +02:00
Demian c4b51e4006
Merge branch 'master' into master 2018-08-05 12:13:02 +02:00
Stefan Schlesinger cb37e3ba92
Update docker-entrypoint.sh 
Make netbox-docker function with  v2.4-beta1 again, fixes #84.

> The shell --plain option is deprecated in favor of -i python or --interface python.
> The shell --interface option now accepts python to force use of the “plain” Python interpreter.
https://docs.djangoproject.com/en/2.0/releases/1.10/#deprecated-features-1-10
 2018-07-24 10:56:46 +02:00
Nicolas Boufidjeline 9d1a602f71
Update ldap_config.py 2018-07-20 12:24:17 +02:00
Nicolas Boufidjeline 5f24972bb7
Change default value of AUTH_LDAP_USER_DN_TEMPLATE 2018-07-20 12:21:47 +02:00
Demian 824141f587
Merge pull request #82 from DisasteR/fix-bad-ldap-variable 
resolve AUTH_LDAP_GROUP_CACHE_TIMEOUT from env
 2018-07-17 11:49:06 +02:00
Nicolas Boufidjeline 4c49cad744 Add auth-ldap-user-dn-template in ldap_config.py 2018-07-11 16:50:02 +02:00
Benjamin 1835f0b05c
resolve AUTH_LDAP_GROUP_CACHE_TIMEOUT from env 
Resolve ValueError: invalid literal for int() for AUTH_LDAP_GROUP_CACHE_TIMEOUT
 2018-07-11 11:52:25 +02:00
Demian 48accce8e6
Merge pull request #80 from ninech/fix-79 
Import Error Fix
 2018-06-28 10:22:17 +02:00
thde 5e0b0a608b use docker-compose.yml instead of docker-compose.test.yml 2018-06-28 09:59:59 +02:00
thde 0d8e719675 add initializers to specs 2018-06-28 09:44:07 +02:00
thde cc160198ef fix import constant 2018-06-28 09:28:23 +02:00
thde d851f28913 fix deprecated value 2018-06-28 09:28:07 +02:00
Demian 8333fafcf1
Merge pull request #55 from Grokzen/auto_weight_choices 
Add support for auto_weight counter
 2018-06-26 09:03:15 +02:00
Demian c85f658982
Merge branch 'master' into auto_weight_choices 2018-06-25 16:31:39 +02:00
Demian 3e485049e0
Merge pull request #66 from Grokzen/fix_filter_logic_field 
Fix for broken field filterable
 2018-06-25 16:31:16 +02:00
Demian 6787425707
Merge branch 'master' into fix_filter_logic_field 2018-06-25 11:27:05 +02:00
Demian df85563b1d
Merge pull request #78 from ninech/allowed-hosts 
add allow all hosts by default
 2018-06-25 11:16:23 +02:00
thde 10533ab4c3 add allow all hosts by default 2018-06-25 10:41:31 +02:00
Demian 1e1a265b4a
Merge pull request #77 from ninech/license 
add license
 2018-06-25 09:12:39 +02:00
thde 26728c7366 add license 2018-06-22 16:27:45 +02:00
Samuel Sieg 024ab5c138
Merge pull request #70 from ScanPlusGmbH/alpine-update 
Update to Alpine 3.7
 2018-06-04 13:41:35 +02:00
Samuel Sieg 16c750d8e4
Merge branch 'master' into alpine-update 2018-06-04 11:25:02 +02:00
Samuel Sieg 1be054bb0e Fix ssl package dependency 2018-06-04 11:17:41 +02:00
Grokzen 5a1f6f6dd9 Fix the default creation value for weight 2018-05-18 21:33:50 +02:00
Grokzen 170bf4e03d Remove unused variable 2018-05-18 21:24:31 +02:00
Grokzen 7afa9454ba Bump version to 0.3.0 and add line in README describing the breaking change. 2018-05-18 21:22:05 +02:00
Grokzen 187c349fde Add support for auto_weight counter on choices when loading selection field from custom_fields.yml 
This also fixes a bug when using the same value for 2 different custom fields breaks becuase it tries to
create a new CustomFieldChoice object instead of reusing the one that already exists.
 2018-05-18 21:17:21 +02:00
Grokzen cdbfdaf361 Implement fix for field 'filterable' that was broken. Added new custom field parameter 'filter_logic' 2018-05-18 21:16:01 +02:00
Tobias Genannt 5e5cc13a05 Update to Alpine 3.7 
Because the tag "python:3.6-alpine" points to Alpine 3.4 which is now
end of life (as of 2018-05-01) the image now pulls the Alpine 3.7 python
image
 2018-05-09 09:52:33 +02:00
Christian Mäder 19805a4312
Merge pull request #64 from hikhvar/dont-print-credentials 
Do not print the admin credentials on container startup.
 2018-04-19 12:28:56 +02:00
Christoph Petrausch 2579036b0a Fixed missing " 2018-04-19 11:55:41 +02:00
Christoph Petrausch f124417f69 Added username and email of superuser 2018-04-19 11:53:55 +02:00
Christoph Petrausch d9b9a8adda Do not print the admin credentials. All outputs from STDOUT may end up in a central log store. This will compromise the superuser credentials. 2018-04-18 13:39:54 +02:00
Christian Mäder c231aa97a1
Merge pull request #62 from mtwstudios/patch-1 
set MEDIA_ROOT to match docker-compose.yml
 2018-04-10 13:55:00 +02:00
Christian Mäder 38f3ca8848
Merge branch 'master' into patch-1 2018-04-10 13:53:07 +02:00
Christian Mäder a5dccb2558
Revert "⚙️ Print every command" 
This reverts commit 1fb6b80f93.
 2018-04-10 11:42:06 +02:00
Christian Mäder 1fb6b80f93
⚙️ Print every command 2018-04-10 11:13:52 +02:00
Christian Mäder 6c3966415b
⚙️ Additional build debug info 2018-04-10 10:58:31 +02:00
Christian Mäder 626195d00f
⚙️ Parallel builds 2018-04-10 10:37:27 +02:00
Christian Mäder 8ffe6529c9
⚙️ Reduce number of branches to build 2018-04-10 10:13:53 +02:00
Matthew Tom-Wolverton b28e615023
set MEDIA_ROOT to match docker-compose.yml 
otherwise the default of `/etc/netbox/media` is used, which doesn't persist
 2018-04-08 19:46:26 -04:00
Christian Mäder 4bd5f0903f
🐞 Fix building all branches 2018-04-06 11:16:29 +02:00
Christian Mäder 6945157e86
Merge pull request #59 from mchlumsky/proxy_support 
Add proxy support to build.sh
 2018-04-05 16:40:38 +02:00
Martin Chlumsky 2bbb7f68f2 Add proxy support to build.sh. 2018-04-05 10:25:27 -04:00
Christian Mäder 75fdcfdeb7
Merge pull request #61 from ScanPlusGmbH/fix-typo 
Fix typo
 2018-04-04 15:32:00 +02:00
Tobias Genannt add2a04ae6 Fix typo 2018-04-04 13:13:41 +02:00
Christian Mäder 1a78a881aa
Merge branch 'ScanPlusGmbH-issue-54' 2018-04-04 10:17:57 +02:00