Commit Graph

417 Commits

Author SHA1 Message Date
Christian Mäder
05d32ae705 Massive speedup in executing startup_scripts 2019-12-14 18:16:31 +01:00
Christian Mäder
fd955544af
Merge pull request #196 from jsimonetti/rackgroup_initialiser
Add rack group initialiser
2019-12-14 17:31:38 +01:00
Christian Mäder
0a77c3d81e
Merge pull request #198 from mattolenik/fix-197
Remove use of GNU date extensions when labeling images
2019-12-14 17:20:36 +01:00
Matt Olenik
66e90428b5 Remove use of GNU date extensions when labeling images
Fixes #197
2019-12-13 16:06:18 -08:00
Jeroen Simonetti
93dee74459 Add rack group initialiser
Fixes #192

Signed-off-by: Jeroen Simonetti <jeroen@simonetti.nl>
2019-12-11 10:57:14 +01:00
Christian Mäder
bf2a21ddea
Merge pull request #177 from sdktr/patch-2
Add SSLMODE to database connection settings
2019-12-10 22:39:53 +01:00
Christian Mäder
6a07527632
Merge pull request #194 from netbox-community/update-redis
Update Redis to Version 5
2019-12-10 22:35:55 +01:00
Christian Mäder
0f7675c792
Merge pull request #193 from netbox-community/revert-180
Revert "Fix #179 'libc not found'"
2019-12-10 22:35:39 +01:00
Christian Mäder
f3bbfdc34c
Merge pull request #189 from netbox-community/GettingStarted
Adds a link to the Getting Started wiki section to the README
2019-12-10 22:35:17 +01:00
Stefan de Kooter
135199e597
Merge branch 'master' into patch-2 2019-12-09 22:54:30 +01:00
Christian Mäder
8a92640d10 Re-wording of dependencies check paragraph 2019-11-26 12:28:43 +01:00
Christian Mäder
788804627e Fix typo 2019-11-26 12:27:25 +01:00
Christian Mäder
1ce99cf02f update redis 2019-11-26 12:14:51 +01:00
Christian Mäder
8664e42233 Revert "Fix #179 'libc not found'"
This reverts commit feb810ab27.
2019-11-26 11:40:10 +01:00
Christian Mäder
c083baf640 Preparation for 0.19.4 2019-11-25 17:12:29 +01:00
Christian Mäder
d1d71e1256 Merge branch 'mattolenik-fix-skip-git' 2019-11-25 17:11:10 +01:00
Christian Mäder
6c762a7755 Merge branch 'fix-skip-git' of https://github.com/mattolenik/netbox-docker into mattolenik-fix-skip-git 2019-11-25 17:11:03 +01:00
Christian Mäder
946a503a25 Merge branch 'edenpark59-master' 2019-11-25 17:10:33 +01:00
Christian Mäder
6a8ffc1f02 Merge branch 'master' of https://github.com/edenpark59/netbox-docker into edenpark59-master 2019-11-25 17:10:22 +01:00
Christian Mäder
ca2b875ab9 Merge branch 'markhoney-patch-1' 2019-11-25 17:09:49 +01:00
Christian Mäder
29185fb9fd reorganized docker ignore file
.. and added some more files to it.
2019-11-25 17:09:37 +01:00
Christian Mäder
df7241ac5c Merge branch 'patch-1' of https://github.com/markhoney/netbox-docker into markhoney-patch-1 2019-11-25 17:07:12 +01:00
Christian Mäder
52d67f6b60 Merge branch 'labelling' 2019-11-25 17:06:43 +01:00
Matt Olenik
34ce5be006 Respect SKIP_GIT environment variable when building
Fixes issue #190
2019-11-21 08:09:01 -08:00
Christian Mäder
f2fd7dbbe7 Adds a link to the Getting Started wiki section to the README 2019-11-20 11:09:37 +01:00
EdenPark59
08cda559a3
Update docker-compose.yml 2019-11-20 11:00:09 +01:00
sylvain.petit
02a5171e37 Update Nginx 1.17.6-alpine docker-compose.yml 2019-11-20 10:09:02 +01:00
Mark Honeychurch
552676cc9d
Ignore local override file
Adding an ignore rule for docker-compose.override.yml should allow people to clone this repo and use an override file to match their environment, without that file causing issues every time they pull a new version of the repo.
2019-11-18 12:20:39 +13:00
Christian Mäder
caaa68234c Adds more labels to the Dockerfile
It also updates the README and the bug_report template to reflect
the changes. Additionally, in the README some relevant shields from
shields.io are added.

The labels follow [label-schema.org][lsorg] and the [OpenContainer
image spec, section annotations][ocis], specifications.

[lsorg]: http://label-schema.org/rc1/
[ocis]: https://github.com/opencontainers/image-spec/blob/master/annotations.md
2019-11-17 17:13:29 +01:00
Christian Mäder
eddc308055
Merge pull request #182 from netbox-community/feature-request-template
A new issue category for feature/change requests
2019-11-16 22:14:31 +01:00
Christian Mäder
0e2c50c374
A new issue category for feature/change requests 2019-11-12 11:56:22 +01:00
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
6568dff8e1
Add SSLMODE to database connection properties
Defaulting to SSLMODE=prefer, optional override using environment variable: DB_SSLMODE
2019-11-06 10:26:29 +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
Christian Mäder
f7b526eacd Prepare Version 0.19.2 2019-10-24 17:03:14 +02:00
Christian Mäder
e32bb272b2 Merge branch 'ScanPlusGmbH-fix-170' 2019-10-24 17:02:47 +02:00
Tobias Genannt
e3f632d77f Fixes #170 - "drf-yasg" installed into wrong dir
With the new multistage build the pip install command put some packages
in the wrong directory. This resuled in them not being copied into the
runtime images. This commit add the additional "--prefix" option to the
install command. After that all test run and we no longer get the error
"ModuleNotFoundError: No module named 'drf_yasg'".
2019-10-24 17:02:23 +02:00
Christian Mäder
63174f85ae
Merge pull request #171 from tovin07/remove-trailing-space
Remove trailing space in Dockerfile
2019-10-24 16:47:50 +02:00
Nguyễn Trọng Vĩnh
eb0f704ebe Remove trailing space in Dockerfile 2019-10-23 11:46:26 +07:00
Christian Mäder
b69a38015c
Delete issue_template.md 2019-10-17 17:40:27 +02:00
Christian Mäder
41f6a80c91 Update issue templates 2019-10-17 17:40:01 +02:00
Christian Mäder
79f0670f7e Prepare Version 0.19.1 2019-10-15 12:29:35 +02:00
Christian Mäder
313d1a3aae Merge branch 'ScanPlusGmbH-custom-scripts' 2019-10-15 12:28:32 +02:00
Christian Mäder
8428b9cdbd Merge branch 'custom-scripts' of https://github.com/ScanPlusGmbH/netbox-docker into ScanPlusGmbH-custom-scripts 2019-10-15 12:28:22 +02:00
Christian Mäder
de1e3676eb Fix push 2019-10-15 12:28:04 +02:00