extern/netbox-docker
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox-docker.git synced 2024-12-01 20:34:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
789 Commits 3 Branches 69 Tags 2.4 MiB
71d8ac10ac
Commit Graph

789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tobias Genannt
ed0d099df7
Merge pull request #271 from tobiasge/labels-in-build 
Add labels for all variants
 2020-04-05 13:14:48 +02:00
Tobias Genannt
26d08302e3 Add labels for all variants 
When we don't set the --label argument on the commandline for all
build variants we lose them in the image.
This also prints out the labes on image push.
 2020-04-05 09:29:31 +02:00
Ryan Merolle
64b763429f
update configuration.py for netbox 2.7.11 REDIS config 
update configuration.py to use REDIS config referencing `tasks` in place of `webhooks`
 2020-04-01 23:41:35 -04:00
Christian Mäder
5769684c98
Merge pull request #265 from netbox-community/develop 
Release 0.23.0
 2020-03-30 20:51:22 +02:00
Christian Mäder
23e2da52f8 Preparation for 0.23.0 2020-03-30 15:15:30 +02:00
Christian Mäder
edba1a22fc
Merge pull request #263 from general-programming/RELEASE_CHECK_URL 
Add RELEASE_CHECK_URL to configuration and default env.
 2020-03-30 15:13:59 +02:00
nepeat
f87ffe7c33
Update configuration/configuration.py 
Co-Authored-By: Christian Mäder <cimnine@users.noreply.github.com>
 2020-03-29 01:40:08 -07:00
erin
8bc77c1bc0 Add RELEASE_CHECK_URL to configuration and default env. 2020-03-27 21:34:51 -07:00
Christian Mäder
7662d81efe
Merge pull request #258 from netbox-community/readme_improvements 
Readme improvements
 2020-03-17 16:39:43 +01:00
Christian Mäder
7f489aa11d
Improved the README 
- adjust the _Quick Start_ section to match the instructions in the _Getting Started_ guide on our wiki
- Adds a new _Getting Help_ section
- Improvements in explaining the tags of the published Docker image
 2020-03-17 16:07:15 +01:00
Tobias Genannt
5c3eff0823
Merge pull request #255 from minitriga/issue_253_docs_2 
Fix embedded documents for Netbox version v2.7.10 and higher.
 2020-03-11 12:16:48 +01:00
Alexander GITTINGS
5f90ad8c56 inlude docs in container 2020-03-11 10:40:10 +00:00
Tobias Genannt
5f1c241145
Merge pull request #245 from ScanPlusGmbH/fix-configuration-inconsistencies 
Fix configuration inconsistencies
 2020-03-11 09:53:21 +01:00
Tobias Genannt
20c7461c7b Fixed test failures because of missing cache 
When running tests with ´test.sh´ some errors where logged because now
redis-cache instance was running.
 2020-02-14 12:38:05 +01:00
Tobias Genannt
b9c44b85cc The Redis cache container was using the wrong env 
Our docker-compose.yml pointed the env file for the Redis cache to the
wrong file. Now the Redis cache password between the netbox.env and
redis-cache.env match.
 2020-02-14 12:38:05 +01:00
Tobias Genannt
355ebadd10 Fixed configuration inconsistency for Redis cache 
In the configuration.py we use database 1 as the default but in the .env
file we used 0. This sets both values to 1 as the default.
 2020-02-14 12:38:05 +01:00
Tobias Genannt
880628876f
Merge pull request #244 from ScanPlusGmbH/init-perms-function 
Permission handling in external function
 2020-02-13 08:15:27 +01:00
Tobias Genannt
8d3bd48c7a Permission handling in external function 
This move the setting of user and group permissions in the startup
script to its own function.
 2020-02-12 09:36:49 +01:00
Tobias Genannt
882f7bcaf2
Merge pull request #238 from ScanPlusGmbH/remove-redundancy 
Add function to load YAML files
 2020-02-10 19:25:42 +01:00
Tobias Genannt
50ade7bce1 Add function to load YAML files 
This commit starts to remove some code redundancy from the startup
scripts for easier maintenance.
 2020-02-10 07:47:17 +01:00
Christian Mäder
80f514fa90
Merge pull request #239 from netbox-community/develop 
Release 0.22.0
 2020-02-08 10:44:21 +01:00
Christian Mäder
c5822b9cec Merge pull request #235 from netbox-community/prepare-0.22.0 
Prepare v0.22.0
 2020-02-08 10:10:51 +01:00
Christian Mäder
e99a222a70 Prepare v0.22.0 2020-02-03 17:56:14 +01:00
Christian Mäder
3717b7469a
Merge pull request #236 from netbox-community/LBegnaud-master 
Permission Wildcards
 2020-02-03 17:55:22 +01:00