Commit Graph

213 Commits

Author SHA1 Message Date
Jakob
4ef7bef4fb
Merge pull request #5 from pterodactyl/feature/docker-environment
Feature/docker environment
2018-05-17 21:22:26 +02:00
Jakob Schrettenbrunner
53a3fbc464 remove trailing slashes from api
use correct handler to provide server logs
remove Baerer from Authorization header to compare it with known tokens
fix wings-api.paw routes
2018-05-17 21:18:02 +02:00
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
1ce617c9a4 spell persistence correctly 2018-04-01 23:52:23 +02:00
Jakob Schrettenbrunner
27b397c712 fix environment_docker_test data path 2018-04-01 23:41:45 +02:00
Jakob Schrettenbrunner
5bba1c0d90 readd docker environment tests
implement Exec()
2018-03-14 13:59:57 +01:00
Jakob Schrettenbrunner
8b43e3a43d rename docker_environment to environment_docker 2018-03-14 10:35:49 +01:00
Jakob Schrettenbrunner
4b182e9fa6 add ctop to vagrant provision for fancy monitoring of containers 2018-03-14 10:34:28 +01:00
Jakob Schrettenbrunner
53704fb0d7 refactor websockets implementation 2018-03-14 10:34:06 +01:00
Jakob Schrettenbrunner
b8b0702f84 switch to moby/moby in the docker_environment 2018-03-14 10:33:23 +01:00
Jakob Schrettenbrunner
d2aa896a1c use go dep with travis 2018-02-20 23:43:33 +01:00
Jakob Schrettenbrunner
5836c320ff fixes for vagrant and new go dep lockfile 2018-02-20 23:38:47 +01:00
Jakob Schrettenbrunner
501409827e some reorganisation etc. in control package
some minor stuff
just pushing so I can try to replace fsouza/go-dockerclient with moby/moby/client
2018-02-20 23:38:29 +01:00
Jakob Schrettenbrunner
184d7e0afe lots of api changes
use jsonapi to format responses
add somewhat working websockets
2018-02-20 23:36:17 +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
Jakob Schrettenbrunner
e4e060a82f rename to new lowercase github namespace 2018-02-20 21:25:31 +01:00
Jakob Schrettenbrunner
0b3fb72a97 update Vagrant to use bento/ubuntu and lowercase github namespace 2018-02-20 21:16:50 +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
3f07cdb4c0
Change example config to better match existing configurations and settings 2018-02-20 13:11:34 -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
72ac95267b fix some merge fails 2017-10-09 21:01:24 +02:00
Jakob Schrettenbrunner
659dbcb8c3 add github.com/gorilla/websocket 2017-10-09 21:00:55 +02:00
Jakob Schrettenbrunner
eb9102d329 Revert "add gorilla websocket"
This reverts commit 830700d587.
2017-10-09 20:53:05 +02:00
Jakob Schrettenbrunner
830700d587 add gorilla websocket 2017-10-09 20:52:53 +02:00
Jakob Schrettenbrunner
44f42eec8c Merge branch 'develop' of github.com:Pterodactyl/wings into develop
# Conflicts:
#	api/api.go
#	api/core_routes.go
#	api/handlers_server.go
#	api/routes_server.go
#	config.example.json
#	utils/logging.go
2017-10-01 20:59:32 +02:00
Jakob Schrettenbrunner
c979285eb9 current state of api & docker env implementation 2017-10-01 20:42:17 +02:00
Jakob Schrettenbrunner
d1fdc713f5 improve vagrant provision script 2017-10-01 20:39:59 +02:00
Jakob Schrettenbrunner
e17d96d094 update gitignore 2017-10-01 20:39:48 +02:00
Dane Everitt
90fd485edf
Lets not, please. 2017-09-30 19:25:45 -05:00
Dane Everitt
edc189001f
Remove ignored files 2017-09-30 18:43:01 -05:00
Dane Everitt
39a79add7c
Untrack 2017-09-30 18:42:33 -05:00
Dane Everitt
339d2d286d
Forgotten routes into v1 namespace 2017-09-30 18:37:08 -05:00
Dane Everitt
1bfc016e1b
Clean up route handling 2017-09-30 18:35:44 -05:00
Dane Everitt
256c566dfe
Change to using yml for configuration files 2017-09-30 17:25:04 -05:00
Jakob Schrettenbrunner
c1054c482f rename tools package to utils 2017-09-24 19:47:40 +02:00
Jakob Schrettenbrunner
8ebc74b3a3 utils: ensure loggin path is used correctly 2017-09-16 14:00:11 +02:00
Jakob Schrettenbrunner
e92e3e4e66 tools: ensure logging path exists 2017-09-16 13:56:20 +02:00
Jakob Schrettenbrunner
5ed3bb2a0c control: change container name prefix to ptdl- as underscores are not valid as hostnames 2017-09-04 00:20:45 +02:00
Jakob Schrettenbrunner
23200339ce travis: disable email notification 2017-09-01 02:34:28 +02:00
Jakob Schrettenbrunner
9268c1e9a8 add webhook notification to travis ci 2017-09-01 01:32:10 +02:00
Jakob Schrettenbrunner
6c58fec7d3 config: fix tests using old config struct 2017-09-01 00:05:36 +02:00
Jakob Schrettenbrunner
4a1682cc96 control: rename server to ServerStruct as it's needed in the api
control: add getServers() function to get a slice of all servers
2017-09-01 00:01:32 +02:00
Jakob Schrettenbrunner
a3fcd7c3e0 config: remove old config struct 2017-09-01 00:00:08 +02:00
Jakob Schrettenbrunner
4800c21be4 wings cmd: add config flag 2017-08-31 23:59:35 +02:00
Jakob Schrettenbrunner
09d2d6ec4a gitignore: ignore built wings executable 2017-08-31 23:59:06 +02:00
Jakob Schrettenbrunner
7b9c67d508 api: improve routes 2017-08-31 23:57:33 +02:00
Jakob Schrettenbrunner
ef28b61136 config: use constants with config keys instead of struct as its easier to handle 2017-08-31 20:13:01 +02:00
Jakob Schrettenbrunner
5f0804ea53 travis: switch to go 1.9 2017-08-31 20:04:53 +02:00