Commit Graph

302 Commits

Author SHA1 Message Date
Christian Mäder 9601cb1e54 Merge branch 'master' into improved_build_speed 2019-06-12 17:28:52 +02:00
Christian Mäder 54ac5dc2ab Merge branch 'mryauch-master' 2019-06-12 17:18:48 +02:00
Christian Mäder 821fb5f36e Caching of requirements.txt
After [a discussion][1] with rje6459 on the networktocode Slack
in the #netbox-docker channel we've come up with a small improvement
to those that regularly have to build netbox docker locally.

It fetches the "requirements.txt" from the desired branch before
downloading netbox itself.

[1]: https://networktocode.slack.com/archives/CD23LP8BC/p1558537080023200
2019-05-22 18:05:54 +02:00
Matthew Yauch 7362e275b0 Add AUTH_LDAP_GROUP_TYPE env variable support
Dynamically imports the correct class/subclass from django_auth_ldap.config based on the AUTH_LDAP_GROUP_TYPE environment variable.
2019-05-09 07:47:28 -07:00
Christian Mäder 6c3db3deff Update django to 2.2 2019-05-09 09:57:01 +02:00
Christian Mäder 2f8ea89d54 Prepare Version 0.13.0 2019-05-08 12:00:57 +02:00
Christian Mäder 7008c03bcb Merge branch 'mryauch-mryauch-patch-1' 2019-05-08 11:57:50 +02:00
Christian Mäder 8f39034014 Merge branch 'mryauch-patch-1' of https://github.com/mryauch/netbox-docker into mryauch-mryauch-patch-1 2019-05-08 11:57:43 +02:00
Christian Mäder 98833e20c8 Prepare Version 0.12.0 2019-05-08 11:43:29 +02:00
Christian Mäder a5e51dfb47 Merge branch 'ajknv-master' 2019-05-08 11:38:31 +02:00
Christian Mäder 936d868582 Merge branch 'master' of https://github.com/ajknv/netbox-docker into ajknv-master 2019-05-08 11:38:22 +02:00
Matthew Yauch 96924736df
Updated README.md to reflect AUTH_LDAP_BIND_PASSWORD secret support 2019-05-01 08:14:26 -07:00
Matthew Yauch 5107fb7c6b
AUTH_LDAP_BIND_PASSWORD secret file support 2019-04-30 14:24:22 -07:00
Christian Mäder 9eef398a9d prepare next version 2019-03-27 14:23:28 +01:00
Christian Mäder e83db27b91
Merge pull request #131 from Bialogs/selinux
Add shared (z) container volume SELinux labels to the volumes created…
2019-03-27 14:19:18 +01:00
Christian Mäder 4419646732 Merge branch 'ScanPlusGmbH-short-tag' 2019-03-27 12:01:06 +01:00
Christian Mäder 286bfa0248 reorganized tagging 2019-03-27 12:00:32 +01:00
Christian Mäder e768cb5b87 Merge branch 'short-tag' of https://github.com/ScanPlusGmbH/netbox-docker into ScanPlusGmbH-short-tag 2019-03-27 08:13:58 +01:00
Kyle Fagan e45773c29f
Add shared (z) container volume SELinux labels to the volumes created by docker-compose. 2019-03-25 16:22:37 -04:00
Tobias Genannt 220370ed76 Add short version tag
Adds a short version tag in the form of v$MAJOR.$MINOR. This tags
creates the possibillity to follow patch releases automatically with the
scheduled import option in Openshift and Kubernetes.
2019-03-22 08:28:41 +01:00
Christian Mäder b49e6fac14
Update README.md
Fix the link to the configuration file, since it's core was "outsourced" some time ago.
2019-03-19 20:33:31 +01:00
Alexander Kinneer 5beb3093db Add support for using SSL connections to Redis. 2019-03-19 11:35:45 -05:00
Christian Mäder df16a431ca
Prepare Version 0.10.0
0.9.0 was already tagged without a version increment
2019-03-19 17:14:08 +01:00
Christian Mäder 585e411cde
Prepare Version 0.9.0 2019-03-19 17:12:40 +01:00
Christian Mäder e17baea76c
Merge pull request #128 from ScanPlusGmbH/optimze-startup
Make startup scripts optional
2019-03-19 17:12:15 +01:00
Tobias Genannt 8c95f32b0c Make startup scripts optional
To optimize the application boot time the startup scripts can now be
disabled by an ENV variable. The default when the variable is not set,
is to run the startup scripts. This means that the default behaviour is
not changed from earlier releases.
2019-03-11 12:31:41 +01:00
Christian Mäder d4b394c999
Prepare 0.9.0 2019-02-22 14:03:42 +01:00
Christian Mäder 9c259adc88
Merge branch 'cimnine-update-django' 2019-02-22 13:53:49 +01:00
Christian Mäder 582064f4cd
Loosen version pinning for Django
This change is in accordance with https://github.com/digitalocean/netbox/issues/2808
2019-02-22 13:52:37 +01:00
Christian Mäder f8ea0f74ec
Prepare 0.8.0 2019-02-22 13:49:48 +01:00
Christian Mäder 5cf9c3b4b1
Merge branch 'ScanPlusGmbH-master' 2019-02-22 13:46:28 +01:00
Tobias Genannt 2450a70ca8 Update Alpine
This updates to the newest stable version (Alpine 3.9)
2019-02-21 15:30:40 +01:00
Christian Mäder e9bea0a420
Update README.md 2019-02-07 09:49:11 +01:00
Christian Mäder 4895874845
Update README.md 2019-02-07 09:47:01 +01:00
Christian Mäder 7eca562252
Merge pull request #122 from cimnine/master
Fix DEBUG preventing build
2019-02-07 09:36:05 +01:00
Christian Mäder fda1c272e9
fix DEBUG 2019-02-07 09:34:24 +01:00
Christian Mäder 609105e170
Merge pull request #121 from cimnine/master
Fix build target
2019-02-06 14:55:43 +01:00
Christian Mäder 740fa8128d
Fix build target 2019-02-06 14:54:41 +01:00
Christian Mäder 9fdbd2f501
Merge pull request #120 from cimnine/master
Fix default in build.sh
2019-02-06 14:51:59 +01:00
Christian Mäder c1946751ef
Fix default in build.sh 2019-02-06 14:50:00 +01:00
Christian Mäder a8b66fc082
Merge pull request #119 from cimnine/master
Remove deprecation warning for netboxcommunity images
2019-02-06 12:39:40 +01:00
Christian Mäder ae9e945851
Remove deprecation warning for netboxcommunity images 2019-02-06 12:38:36 +01:00
Christian Mäder fc1507a55d
Merge pull request #118 from cimnine/consistent_variables
Consistent variable use in build scripts
2019-02-06 12:35:18 +01:00
Christian Mäder c7ab15f914
Consistent variable use in build scripts 2019-02-06 12:30:08 +01:00
Christian Mäder 1c42f14bf0
Merge pull request #117 from cimnine/complete_migration
Update references to netboxcommunity
2019-02-06 11:47:44 +01:00
Christian Mäder 6182133c7a
Update references to netboxcommunity 2019-02-06 11:46:20 +01:00
Christian Mäder 1e002846ef
Merge pull request #116 from cimnine/docker-hub_build_system
Build system for hub.docker.com
2019-02-06 11:34:00 +01:00
Christian Mäder 09b4937b35
Update README 2019-02-06 11:24:01 +01:00
Christian Mäder 4ef420d443
Build system for hub.docker.com 2019-02-06 10:09:44 +01:00
Christian Mäder 5a09659278
Code style improvements 2019-01-30 13:58:23 +01:00