Commit Graph

14 Commits

Author SHA1 Message Date
Jakob Schrettenbrunner
09da18f42e Merge branch 'develop' into feature/docker-environment
# Conflicts:
#	.dev/vagrant/provision.sh
#	Gopkg.lock
#	Gopkg.toml
#	Vagrantfile
#	api/api.go
#	api/auth.go
#	api/handlers.go
#	api/handlers_server.go
#	api/routes.go
#	api/utils.go
#	command/root.go
#	control/docker_environment.go
#	control/server.go
#	glide.lock
#	glide.yaml
#	utils/logger.go
#	wings.go
2018-05-16 10:00:07 +02:00
Jakob Schrettenbrunner
b8b0702f84 switch to moby/moby in the docker_environment 2018-03-14 10:33:23 +01:00
Jakob Schrettenbrunner
5836c320ff fixes for vagrant and new go dep lockfile 2018-02-20 23:38:47 +01:00
Dane Everitt
bbc6d26b35
Break more of everything 2018-02-20 15:20:57 -06:00
Jakob Schrettenbrunner
31f4b465c1 replace glide with go dep 2018-02-20 21:36:07 +01:00
Dane Everitt
4359d152b7
Butcher the app in an attempt to make it boot past step 1 2018-02-20 14:00:09 -06:00
Dane Everitt
bacdfae768
Probably breaks everything, lowercase pterodactyl 2018-02-20 13:33:32 -06:00
Dane Everitt
ea7cdbe044
Switch to dep from glide.
I maybe know what I'm doing, but probably not.
2018-02-20 13:01:46 -06:00
Jakob Schrettenbrunner
a2af38f03e replace dep with glide 2017-06-27 12:43:55 +02:00
Jakob Schrettenbrunner
2322a9721a add gin-gonic dependency 2017-06-27 10:42:09 +02:00
Jakob Schrettenbrunner
271e4fb5ef use goverage for testing with coverage reports
update dependencies
2017-06-26 20:28:25 +02:00
Jakob Schrettenbrunner
06055d6265 unmarshal config into struct with viper for consistent access 2017-06-26 11:07:53 +02:00
Jakob Schrettenbrunner
b4b0c3f9e6 fix Gopkg.toml 2017-06-21 00:54:20 +02:00
Jakob Schrettenbrunner
2568d9dd1a add some libraries for config and logging 2017-06-19 00:00:58 +02:00