matthew/netbox-docker
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
382 Commits 2 Branches 66 Tags 1.7 MiB
3f2fe54bfd
Commit Graph

382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Christian Mäder
de1e5edd02 Prepare Version 0.19.0 2019-10-15 11:48:25 +02:00
Christian Mäder
ef989284c2
Merge pull request #159 from netbox-community/multistage-build 
Refactor to multistage builds
 2019-10-15 11:47:09 +02:00
Christian Mäder
e060f86b9a Corrections for shellcheck warnings 2019-10-15 10:03:39 +02:00
Christian Mäder
0a38220497 Update purpose text in build.sh 2019-10-15 01:00:21 +02:00
Christian Mäder
fb60841047 Only test 'latest' in PRs 
Because it's the only tag being built
 2019-10-15 00:56:37 +02:00
Christian Mäder
0f4a872082 More tests 2019-10-15 00:47:19 +02:00
Christian Mäder
26b1f59d66 Improve formating and fix typo 2019-10-15 00:40:48 +02:00
Christian Mäder
064908397e Improved Build Job descriptions 2019-10-15 00:34:15 +02:00
Christian Mäder
42642c94c3 Only push on 'main' branch 2019-10-15 00:34:15 +02:00
Christian Mäder
123fd981e9 Fix build 
The Docker Hub build system runs on Ubuntu Xenial containers.
Xenial's git is 2.7.4, which does not know the `-P` flag yet.
 2019-10-15 00:34:15 +02:00
Christian Mäder
20109c3392 Checkout the repository with git 
This changes the build process even further. Instead
f using `wget` to fetch the current code, `git` is used.
This allows for faster switching between branches,
because only the differences between them have to be
fetched from the server.

But the main advantage is that the build cache can
finally be used as designed by Docker. Repetitive
builds are very fast now. This is also true between
branches and tags, as long as the `requirements.txt`
file doesn't change.
 2019-10-15 00:34:15 +02:00
Christian Mäder
f3b9c34e3b externalize netbox download with wget 2019-10-15 00:34:15 +02:00
Christian Mäder
ab4b8720d1 Fix caching in build.sh 2019-10-15 00:34:15 +02:00
Christian Mäder
052b53aa5c Fix apt-get detection 2019-10-15 00:34:15 +02:00
Christian Mäder
fadac8c5c3 Only build the master branch to speed up the test 2019-10-15 00:34:15 +02:00
Christian Mäder
d0c9dfe2e5 Try to get PR builds working 2019-10-15 00:34:15 +02:00
Christian Mäder
d0ebb34432 Refactor to multistage builds 
This commit introduces a huge change in the build process.

What changed:

- Dockerfile.ldap was integrated into Dockerfile as a seperate
  [build stage][multistage-build].
- All the build scripts were refactored according to this.
- The `docker-compose.yml` file was adjusted likewise.
- The main build script, `/build.sh`, now always builds all
  targets (formerly called variants).
- The minimal requirements for Docker and docker-compose
  have increased.
- The build on hub.docker.com must be adjusted.

This change should also fix #156 permanently.

[multistage-build]: https://docs.docker.com/develop/develop-images/multistage-build/
 2019-10-15 00:34:15 +02:00
Tobias Genannt
db04deca0d Add support for custom scripts 
Custom scripts were added to Netbox in version 2.6.3. This adds a new
directory to the image where custom scripts can be placed.
 2019-10-14 09:50:05 +02:00
Christian Mäder
c148d3ceb9 Prepare Version 0.18.2 2019-10-14 09:20:22 +02:00
Christian Mäder
42826ae133 Fix #165 2019-10-14 09:17:32 +02:00
Christian Mäder
19728fa3e6 prepare 0.18.1 2019-10-13 14:03:56 +02:00
Christian Mäder
e1f054b6b5 Merge branch 'fix-160' 2019-10-13 14:03:34 +02:00
Christian Mäder
79d349133e fix typo 2019-10-13 14:03:22 +02:00
Christian Mäder
cb8007e41d
Adds a hyperlink for the #netbox-docker channel 2019-10-12 15:16:17 +02:00
Christian Mäder
b790796f9b Prepare Version 0.18.0 2019-10-12 14:56:03 +02:00
Christian Mäder
20c234a96e Introduce $SKIP_SUPERUSER 
This adds a new variable to skip the creation of the superuser.
That is useful for LDAP and for production environments.

Fixes #160
 2019-10-12 14:49:40 +02:00
Christian Mäder
5ae5977717 Merge branch 'axarriola-master' 2019-10-12 14:27:11 +02:00
Christian Mäder
e894cdaa06 Reformat initializers and add some IPv6 examples 2019-10-12 14:23:41 +02:00
Christian Mäder
5defc38294 Add missing break 2019-10-12 14:23:11 +02:00
Christian Mäder
61c0a9b519 Merge branch 'master' of https://github.com/axarriola/netbox-docker into axarriola-master 2019-10-12 14:02:35 +02:00
Alvaro Arriola
992a8f1d5f More typos. Tested all changes. 2019-10-11 18:08:22 +02:00
Alvaro Arriola
2d25907cba Fixing typos. 2019-10-11 17:30:38 +02:00
Alvaro Arriola
8a40c6e0a3 Merge branch 'master' of https://github.com/netbox-community/netbox-docker 2019-10-11 17:06:18 +02:00
Christian Mäder
ed8e339bfe
Merge pull request #162 from netbox-community/cleanup 
Remove debug statement
 2019-10-11 16:32:07 +02:00
Christian Mäder
4b1514f8d3
Remove debug statement 2019-10-11 16:31:56 +02:00