135199e597
Merge branch 'master' into patch-2
2019-12-09 22:54:30 +01:00
c083baf640
Preparation for 0.19.4
2019-11-25 17:12:29 +01:00
d1d71e1256
Merge branch 'mattolenik-fix-skip-git'
2019-11-25 17:11:10 +01:00
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
946a503a25
Merge branch 'edenpark59-master'
2019-11-25 17:10:33 +01:00
6a8ffc1f02
Merge branch 'master' of https://github.com/edenpark59/netbox-docker into edenpark59-master
2019-11-25 17:10:22 +01:00
ca2b875ab9
Merge branch 'markhoney-patch-1'
2019-11-25 17:09:49 +01:00
29185fb9fd
reorganized docker ignore file
...
.. and added some more files to it.
2019-11-25 17:09:37 +01:00
df7241ac5c
Merge branch 'patch-1' of https://github.com/markhoney/netbox-docker into markhoney-patch-1
2019-11-25 17:07:12 +01:00
52d67f6b60
Merge branch 'labelling'
2019-11-25 17:06:43 +01:00
34ce5be006
Respect SKIP_GIT environment variable when building
...
Fixes issue #190
2019-11-21 08:09:01 -08:00
08cda559a3
Update docker-compose.yml
2019-11-20 11:00:09 +01:00
02a5171e37
Update Nginx 1.17.6-alpine docker-compose.yml
2019-11-20 10:09:02 +01:00
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
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
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
0e2c50c374
A new issue category for feature/change requests
2019-11-12 11:56:22 +01:00
c790ce5953
Preparation for 0.19.3
2019-11-11 10:27:55 +01:00
cf7aef31e2
Merge pull request #180 from ScanPlusGmbH/fix-179
...
Fix #179 'libc not found'
2019-11-11 10:21:32 +01:00
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
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
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
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
8d71d2f973
Merge pull request #175 from ScanPlusGmbH/optimze-pip-install
...
Optimize pip install command
2019-11-01 14:20:20 +01:00
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
f7b526eacd
Prepare Version 0.19.2
2019-10-24 17:03:14 +02:00
e32bb272b2
Merge branch 'ScanPlusGmbH-fix-170'
2019-10-24 17:02:47 +02:00
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
63174f85ae
Merge pull request #171 from tovin07/remove-trailing-space
...
Remove trailing space in Dockerfile
2019-10-24 16:47:50 +02:00
eb0f704ebe
Remove trailing space in Dockerfile
2019-10-23 11:46:26 +07:00
b69a38015c
Delete issue_template.md
2019-10-17 17:40:27 +02:00
41f6a80c91
Update issue templates
2019-10-17 17:40:01 +02:00
79f0670f7e
Prepare Version 0.19.1
2019-10-15 12:29:35 +02:00
313d1a3aae
Merge branch 'ScanPlusGmbH-custom-scripts'
2019-10-15 12:28:32 +02:00
8428b9cdbd
Merge branch 'custom-scripts' of https://github.com/ScanPlusGmbH/netbox-docker into ScanPlusGmbH-custom-scripts
2019-10-15 12:28:22 +02:00
de1e3676eb
Fix push
2019-10-15 12:28:04 +02:00
de1e5edd02
Prepare Version 0.19.0
2019-10-15 11:48:25 +02:00
ef989284c2
Merge pull request #159 from netbox-community/multistage-build
...
Refactor to multistage builds
2019-10-15 11:47:09 +02:00
e060f86b9a
Corrections for shellcheck warnings
2019-10-15 10:03:39 +02:00
0a38220497
Update purpose text in build.sh
2019-10-15 01:00:21 +02:00
fb60841047
Only test 'latest' in PRs
...
Because it's the only tag being built
2019-10-15 00:56:37 +02:00
0f4a872082
More tests
2019-10-15 00:47:19 +02:00
26b1f59d66
Improve formating and fix typo
2019-10-15 00:40:48 +02:00
064908397e
Improved Build Job descriptions
2019-10-15 00:34:15 +02:00
42642c94c3
Only push on 'main' branch
2019-10-15 00:34:15 +02:00
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
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
f3b9c34e3b
externalize netbox download with wget
2019-10-15 00:34:15 +02:00
ab4b8720d1
Fix caching in build.sh
2019-10-15 00:34:15 +02:00
052b53aa5c
Fix apt-get detection
2019-10-15 00:34:15 +02:00
Stefan de Kooter
Christian Mäder
Matt Olenik
EdenPark59
sylvain.petit
Mark Honeychurch
Christian Mäder
Tobias Genannt
Nguyễn Trọng Vĩnh