From 3e4fcd527d64126c1175c5c808791df61d10bd3e Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Wed, 3 Apr 2019 22:20:39 -0700
Subject: [PATCH] Pass through startup as argument

---
 server/environment_docker.go | 14 ++++++++++----
 server/server.go             |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/server/environment_docker.go b/server/environment_docker.go
index 2c83385..d09a9e8 100644
--- a/server/environment_docker.go
+++ b/server/environment_docker.go
@@ -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
diff --git a/server/server.go b/server/server.go
index 450f102..b4d6ad3 100644
--- a/server/server.go
+++ b/server/server.go
@@ -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()
-}
+}
\ No newline at end of file