MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass through startup as argument

Browse Source
This commit is contained in:
Dane Everitt 2019-04-03 22:20:39 -07:00
parent 08af485c40
commit 3e4fcd527d
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/environment_docker.go
View File

@ -88,13 +88,13 @@ func (d *DockerEnvironment) Create() error {
conf := &container.Config{
Hostname: "container",
User: "pterodactyl",
User: d.Configuration.Container.User,
AttachStdin: true,
AttachStdout: true,
AttachStderr: true,
OpenStdin: true,
Tty: true,
Cmd: strings.Split(d.Server.Invocation, " "),
Image: d.Server.Container.Image,
Env: d.environmentVariables(),
@ -118,10 +118,16 @@ func (d *DockerEnvironment) Create() error {
// Returns the environment variables for a server in KEY="VALUE" form.
func (d *DockerEnvironment) environmentVariables() []string {
var out []string
var out = []string{
fmt.Sprintf("STARTUP=%s", d.Server.Invocation),
}
for k, v := range d.Server.EnvVars {
out = append(out, fmt.Sprintf("%s=\"%s\"", k, v))
if strings.ToUpper(k) == "STARTUP" {
continue
}
out = append(out, fmt.Sprintf("%s=\"%s\"", strings.ToUpper(k), v))
}
return out

2
server/server.go
View File

@ -169,4 +169,4 @@ func (s *Server) IsBootable() bool {
// for the server is setup, and that all of the necessary files are created.
func (s *Server) CreateEnvironment() error {
return s.environment.Create()
}
}