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

613 Commits

Author SHA1 Message Date
Tobias Genannt e2711ca205
Merge pull request #326 from tobiasge/fix-startup-2.9 
Fixes for Netbox 2.9
 2020-09-01 10:37:37 +02:00
Tobias Genannt a87f2b3331
Merge pull request #329 from tdorsey/patch-1 
Fix typo in Readme
 2020-08-31 08:03:33 +02:00
tdorsey f174749f98
chore: fix typo 2020-08-30 22:06:20 -04:00
Tobias Genannt b02a93904e Fixed IP address creation for Netbox 2.9 2020-08-24 14:20:35 +02:00
Tobias Genannt 3ace32dfc2 Fixed creation of passwords for Netbox 2.9 2020-08-24 11:08:28 +02:00
Tobias Genannt 9fae2b0f74 Fixed VM interface creation for Netbox 2.9 2020-08-24 11:08:23 +02:00
Christian Mäder 23c3240863
Merge pull request #319 from jamiereid/release 
Update README.md
 2020-07-14 09:09:20 +02:00
Jamie Reid 3f9e874d77
Update README.md 
fix spelling mistake
 2020-07-14 11:19:49 +10:00
Christian Mäder 4b0f158852
Merge pull request #313 from jgcasd/jgcasd-patch-1 
Add optional LOGIN_TIMEOUT to configuration.py
 2020-06-17 15:26:16 +02:00
John G 51490d0039
Added LOGIN_TIMEOUT option to configuration.py 
Added LOGIN_TIMEOUT option to configuration.py. The option is already available in standard Netbox configuration.
 2020-06-16 11:27:59 -07:00
Aurélien Dunand df72d6bbb5 Handle primary IPs on devices and VMs 2020-06-05 13:12:27 +02:00
Christian Mäder 688672de26
Merge pull request #308 from netbox-community/XForwardedProto 
Remove the 'X-Forwarded-Proto' line from the nginx config
 2020-06-05 11:57:23 +02:00
Christian Mäder 5624ecc65e Remove the 'X-Forwarded-Proto' line from the nginx config 
The reason is that in the default configuration nginx is only serving 'http' traffic.
So if an upstream proxy sets the 'X-Forwarded-Proto' header, because it is terminating
TLS, then nginx will overwrite it to 'http'. This will cause django to think the page
is served via 'http' and it will not create 'https://...' URLs.

Related to #292
 2020-06-02 16:06:52 +02:00
Christian Mäder 7f93b328af
Merge pull request #307 from netbox-community/FixFileMatching 
Don't try to run non-python files
 2020-06-02 14:42:58 +02:00
Christian Mäder ccad15ecf7 Don't try to run non-python files 2020-06-02 13:37:57 +02:00
Tobias Genannt e9a9d9b70b
Merge pull request #305 from netbox-community/develop 
Preparation for 0.24.1
 2020-05-29 14:41:15 +02:00
Tobias Genannt 03b36058cd Preparation for 0.24.1 2020-05-29 10:09:08 +02:00
Tobias Genannt 9e06a38d41
Merge pull request #304 from tobiasge/fix-303 
Fix #303 for Netbox v2.8.5
 2020-05-29 10:03:22 +02:00
Tobias Genannt b7ad18afb0 Fix #303 for Netbox v2.8.5 
In this Netbox version the ColorChoices where moved to utilities.choiceFix #303 for Netbox v2.8.5

In this Netbox version the ColorChoices where moved to utilities.choicess
 2020-05-27 09:10:24 +02:00
Aurélien Dunand a9232e4f30 Add optional primary_ip on virtual machines initializer 2020-05-22 17:40:11 +02:00
Tobias Genannt 93a3784295
Merge pull request #296 from netbox-community/develop 
Release 0.24.0
 2020-05-16 18:56:06 +02:00
Tobias Genannt 45f7823a17 Preparation for 0.24.0 2020-05-15 13:59:45 +02:00
Tobias Genannt a6584d2874
Merge pull request #274 from tobiasge/optimise-builds 
Optimise builds
 2020-05-15 13:57:43 +02:00
Tobias Genannt fd87c7cb98
Merge pull request #294 from netbox-community/Fix284 
Fix #284: Fixes the bug that initializers with no data stopped the execution of the later initializers
 2020-05-15 13:57:23 +02:00
Christian Mäder 1f38ca0a86
Merge pull request #295 from minitriga/#293_ssl_tls_env 
Implement SSL and TLS Config
 2020-05-15 09:29:02 +02:00
Alexander GITTINGS efec435ba0 fix some issues 2020-05-14 15:37:47 +00:00
Alexander GITTINGS ab8ff04852 #293 2020-05-14 15:09:25 +00:00
Christian Mäder 77feec30a0 Don't stop when startup_scripts quit 
Fixes #284
 2020-05-14 16:59:30 +02:00
mbchristoff bed40b0d05
Add STARTTLS option. (#277) 
* Add STARTTLS option.
 2020-05-14 16:41:42 +02:00
Christian Mäder 24f0545bc6 Merge branch 'ryanmerolle-develop' into develop 2020-05-14 16:20:07 +02:00
Christian Mäder 1bc1ab2a0a Preserve compatibility 2020-05-14 16:19:38 +02:00
Christian Mäder bfa69dc0e9 Merge branch 'develop' of https://github.com/ryanmerolle/netbox-docker into ryanmerolle-develop 2020-05-14 16:17:59 +02:00
Christian Mäder 6c8042b63d
Merge pull request #289 from weisdd/bugfix/devices.py.example 
Fixes #246: Non-working devices.py.example
 2020-05-14 15:35:34 +02:00
Tobias Genannt 795e82be46 Fix shellcheck error 2020-05-14 13:54:40 +02:00
Tobias Genannt d8a6c321a1
Update build.sh 
Include suggestion from cimnine

Co-authored-by: Christian Mäder <cimnine@users.noreply.github.com>
 2020-05-14 13:49:19 +02:00
ibeljakov 1ecf4853b8 Fixed devices.py.example report 2020-05-11 16:46:10 +03:00
Tobias Genannt 5cb8e97e65
Merge pull request #276 from weisdd/bugfix/dockerfile-media-permissions 
Dockerfile: Fixed file permissions for media
 2020-05-06 18:40:00 +02:00
Christian Mäder 98e131fa30
Merge pull request #279 from hoanhan101/release 
Fix typo in overriding docker-compose config
 2020-04-22 22:51:44 +02:00
Hoanh An d6323ce40f
Fix typo in overriding docker-compose config 2020-04-22 16:24:34 -04:00
ibeljakov 1c65f7af10 Dockerfile: Fixed file permissions for media 2020-04-18 17:08:42 +03:00
Tobias Genannt 7fb78b3fd2 Fixed script in case no branch for next exists 
Build now prints a message when no devlop-* branch is found instead of crashing
 2020-04-13 21:44:18 +02:00
Christian Mäder aa9f01a778
Merge pull request #273 from cimnine/NoResponse 
No response
 2020-04-09 21:17:42 +02:00
Tobias Genannt 786f9b50d2 Fixes build when DOCKER_FROM is set but empty 
The DOCKER_FROM is set to an empty value in the push tests.
This expands the check to catch this test case
 2020-04-09 10:26:21 +02:00
Tobias Genannt 5909670690 Fixed "latest" tag 
The variable for the latest tag didn't contain all the needed values.
 2020-04-09 09:04:20 +02:00
Tobias Genannt 231de236e0 Removed Travis CI configuration and script 
We are no longer building the images with Travis CI.
 2020-04-09 08:47:07 +02:00
Christian Mäder 9ea95950b9 probot/no-response configuration 2020-04-09 08:30:30 +02:00
Tobias Genannt d84c399c00 Let "latest" tag follow the highest version 
Latest tag is now added to the new version when it is release by Netbox.
 2020-04-09 08:17:05 +02:00
Tobias Genannt a217ce8ffd Changed "build-branches.sh" to "build-next.sh" 
The old version of "build-branches.sh" skipped the pushing of images when one of
them didn't change its sources. When looking at the Netbox branches I noticed
that the "master" branch only changes when there is a new release. Because we
build the new releases anyway in "build-latest.sh" that leaves "develop" and
"develop-*" which change regularly. The new script "build-next.sh" is responsible
for building "develop-*" as the next major release of Netbox. The build of
"develop" is moved to the Github Action build matrix. This has the additional
advantage of being faster because more builds are done in parallel.
 2020-04-08 22:11:37 +02:00
Tobias Genannt 794fb45e0e Fix shellcheck items found by shellcheck 0.7.1 2020-04-08 16:06:55 +02:00
Tobias Genannt 8e34f46bad Add checks to verifiy if a new build is needed 
This checks if the source materials (python image, Netbox commit,
netbox-docker commit) have changed since the last build. This check is done
by comparing the digest and commit ids from the previous image with the
given tag to the current values taken from the Git and Docker repositories.

The checks are only performed for builds by the automated builds on Github.
 2020-04-08 15:50:06 +02:00