Minimize code duplication for environment variables; ref pterodactyl/panel#2255

This commit is contained in:
Dane Everitt
2020-08-27 20:28:29 -07:00
parent 60acee2df5
commit 711ee2258c
5 changed files with 10 additions and 43 deletions

View File

@@ -148,7 +148,7 @@ func (e *Environment) Create() error {
Tty: true,
ExposedPorts: a.Exposed(),
Image: e.meta.Image,
Env: e.variables(),
Env: e.Configuration.EnvironmentVariables(),
Labels: map[string]string{
"Service": "Pterodactyl",
"ContainerType": "server_process",
@@ -204,12 +204,6 @@ func (e *Environment) Create() error {
return nil
}
func (e *Environment) variables() []string {
v := e.Configuration.EnvironmentVariables()
return append(v, fmt.Sprintf("STARTUP=%s", e.meta.Invocation))
}
func (e *Environment) convertMounts() []mount.Mount {
var out []mount.Mount