354 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christian Mäder	ec8bc17289	Fix typo.	2017-10-16 13:13:12 +02:00
Christian Mäder	1c2265cca0	Merge branch 'rowanruseler-master'	2017-10-16 13:10:21 +02:00
Christian Mäder	6c28529736	Re-phrased the dependencies section	2017-10-16 13:09:17 +02:00
Rowan Ruseler	0ea826346d	Project requirements	2017-10-16 12:33:13 +02:00
Christian Mäder	2cfffae26a	Merge pull request #14 from ninech/fix_config_not_found ... 🐞 The upstream repo remove the docker config	2017-10-13 10:30:40 +02:00
Christian Mäder	94746ac5de	🐞 The upstream repo remove the docker config ... .. so I copied it over to this repo.	2017-10-13 10:10:43 +02:00
Christian Mäder	7ed050316a	✨ Only build prerelease if version higher than stable	2017-10-13 09:43:29 +02:00
Christian Mäder	d7ff6027e6	Merge pull request #11 from ninech/revert_drf_workaround ... Removes workaround for Django Rest Framework	2017-10-12 15:51:49 +02:00
Christian Mäder	38a1c4c7f2	Removes workaround for Django Rest Framework	2017-10-12 15:36:19 +02:00
Christian Mäder	d01fb311c6	Merge pull request #9 from ninech/37619-build-failes ... Set right version of django rest framework	2017-10-10 12:28:20 +02:00
misazr	167f816b94	Add description for library	2017-10-10 11:14:16 +02:00
misazr	6e098da2e6	Merge branch 'master' into 37619-build-failes	2017-10-10 11:07:32 +02:00
misazr	4576531634	Set right version of django rest framework	2017-10-10 09:56:10 +02:00
Christian Mäder	ea5b1e3b3b	Update README.md	2017-10-09 22:05:46 +02:00
Christian Mäder	5a37eaa351	Merge pull request #8 from ninech/snapshot ... Builds snapshot image again	2017-10-05 13:07:31 +02:00
Christian Mäder	ad7e39df4f	Builds snapshot image again	2017-10-05 12:48:00 +02:00
Christian Mäder	33b1475840	✨ Build pre-released versions ... ... instead of development branches.	2017-10-02 11:10:10 +02:00
Christian Mäder	360cb0e90f	📦 Possible fix for script error when pushing	2017-09-29 12:50:41 +02:00
Christian Mäder	a6991b9516	📦 Second attempt to push Docker Images	2017-09-29 12:40:34 +02:00
Christian Mäder	7417d67dea	🔑 Permit escaped values in password	2017-09-29 12:26:41 +02:00
Christian Mäder	e521f1fa55	📦 First attempt to push Docker Images from Travis	2017-09-29 11:39:16 +02:00
Christian Mäder	0f06ad20a8	👷 Show build-status in README	2017-09-29 11:07:52 +02:00
Christian Mäder	90135db50a	📣 Sends us Slack notifications	2017-09-29 11:01:34 +02:00
Christian Mäder	b2b208aeab	Merge branch 'kinocz-master'	2017-09-29 10:58:04 +02:00
Christian Mäder	8e7de67365	Merge branch 'master' of https://github.com/kinocz/netbox-docker into kinocz-master	2017-09-29 10:52:20 +02:00
Christian Mäder	30d18ecb1d	Merge pull request #7 from ninech/travis_build ... 👷 First attempt on travis build	2017-09-29 10:41:22 +02:00
Christian Mäder	a2b28606db	👷 First attempt on travis build	2017-09-29 10:33:18 +02:00
Ondrej Kinovic	c8fa7b9054	use http_host insteda of server_name	2017-09-20 16:56:12 +02:00
Christian Mäder	bdc52d3729	✏️ Fixes the URL to the repo in README ... Fixes #4	2017-09-11 15:40:11 +02:00
Christian Mäder	0edd3d5489	Merge pull request #5 from ninech/readme_overhaul ... ✏️ Overhaul of the README	2017-09-11 15:36:57 +02:00
Christian Mäder	e5e5f0204d	✏️ Overhaul of the README ... Plus some adjustment to the `build.sh` help text. Fixes #3	2017-09-11 15:30:52 +02:00
Christian Mäder	dd5da7afbc	Merge pull request #2 from ninech/add_tests ... Add tests	2017-08-30 12:53:28 +02:00
misazr	de9b6a853d	🐳 Extracted postgres env into new file	2017-08-30 12:12:17 +02:00
Christian Mäder	f9d60692f4	🐳 Adds a sample on how to run netbox tests	2017-08-30 11:10:55 +02:00
Christian Mäder	d58930ab67	🐳 Adds the possibility to overwrite the CMD	2017-08-30 11:10:15 +02:00
Christian Mäder	ab0c255040	🐳 Change to the actual workdir	2017-08-30 11:09:24 +02:00
Christian Mäder	822350d666	🔼 Introduces a more recent gunicorn	2017-08-30 11:08:21 +02:00
Christian Mäder	4ce4373eb0	🐳 By default, build latest from the master branch	2017-08-30 11:07:28 +02:00
Christian Mäder	34d5bd711e	❇️ Don't use Docker cache for 'master' and 'develop'	2017-08-11 17:08:43 +02:00
Christian Mäder	98d90582b7	Merge pull request #1 from ninech/fix_logging ... Fixes logging config that prevented gunicon launch	2017-06-19 09:33:14 +02:00
Christian Mäder	552227cca4	Updates default Docker build branch to a stable version	2017-06-19 09:30:24 +02:00
Christian Mäder	1072d243a3	Fixes logging config that prevented gunicon launch	2017-06-19 09:24:35 +02:00
Christian Mäder	fe82d10aeb	Changes the build script's messages to be more precise	2017-06-09 13:05:02 +02:00
Christian Mäder	57c848978c	Build script recognizes master=latest and develop=snapshot	2017-06-09 12:41:14 +02:00
Christian Mäder	d9c1bd143d	Add suggestions from PRs in digitalocean/netbox-drocker	2017-06-09 10:14:43 +02:00
Christian Mäder	c1e88f81ac	Switch to python 3	2017-06-09 08:38:55 +02:00
Christian Mäder	128c63de2b	Merge remote-tracking branch 'chrigl/fix-add-nginx-conf'	2017-05-10 16:55:35 +02:00
Christoph Glaubitz	72726b2253	Added nginx.conf netbox image ... Without it, the nginx container of the docker-compose.yml refuses to start.	2017-05-09 10:12:36 +02:00
Christian Mäder	898683eeb2	Updated for v2.0-beta3	2017-04-28 08:17:22 +02:00
Jeremy Stretch	573486f0b4	Merge pull request #3 from ninech/docker_improvements ... Docker improvements	2017-04-24 10:21:38 -04:00