From 804f3d5ca92d6e5a455ebe4d73dc8ff0315189ef Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 9 May 2020 19:57:29 -0700
Subject: [PATCH] Always clean up the installer containers, even if there is an
 error during the process; closes pterodactyl/panel#2015

---
 server/install.go | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/server/install.go b/server/install.go
index 995329f..324ced3 100644
--- a/server/install.go
+++ b/server/install.go
@@ -104,6 +104,18 @@ func NewInstallationProcess(s *Server, script *api.InstallationScript) (*Install
 	return proc, nil
 }
 
+// Removes the installer container for the server.
+func (ip *InstallationProcess) RemoveContainer() {
+	err := ip.client.ContainerRemove(context.Background(), ip.Server.Uuid + "_installer", types.ContainerRemoveOptions{
+		RemoveVolumes: true,
+		Force:         true,
+	})
+
+	if err != nil && !client.IsErrNotFound(err) {
+		zap.S().Warnw("failed to delete server installer container", zap.String("server", ip.Server.Uuid), zap.Error(errors.WithStack(err)))
+	}
+}
+
 // Runs the installation process, this is done as a backgrounded thread. This will configure
 // the required environment, and then spin up the installation container.
 //
@@ -117,6 +129,8 @@ func (ip *InstallationProcess) Run() error {
 
 	cid, err := ip.Execute(installPath)
 	if err != nil {
+		ip.RemoveContainer()
+
 		return err
 	}
 
@@ -249,6 +263,7 @@ func (ip *InstallationProcess) GetLogPath() string {
 // installation container.
 func (ip *InstallationProcess) AfterExecute(containerId string) error {
 	ctx := context.Background()
+	defer ip.RemoveContainer()
 
 	zap.S().Debugw("pulling installation logs for server", zap.String("server", ip.Server.Uuid), zap.String("container_id", containerId))
 	reader, err := ip.client.ContainerLogs(ctx, containerId, types.ContainerLogsOptions{
@@ -273,17 +288,6 @@ func (ip *InstallationProcess) AfterExecute(containerId string) error {
 		return errors.WithStack(err)
 	}
 
-	zap.S().Debugw("removing server installation container", zap.String("server", ip.Server.Uuid), zap.String("container_id", containerId))
-	rErr := ip.client.ContainerRemove(ctx, containerId, types.ContainerRemoveOptions{
-		RemoveVolumes: true,
-		RemoveLinks:   false,
-		Force:         true,
-	})
-
-	if rErr != nil && !client.IsErrNotFound(rErr) {
-		return errors.WithStack(rErr)
-	}
-
 	return nil
 }
 
@@ -331,7 +335,7 @@ func (ip *InstallationProcess) Execute(installPath string) (string, error) {
 		Tmpfs: map[string]string{
 			"/tmp": "rw,exec,nosuid,size=50M",
 		},
-		DNS: []string{"1.1.1.1", "8.8.8.8"},
+		DNS: config.Get().Docker.Network.Dns,
 		LogConfig: container.LogConfig{
 			Type: "local",
 			Config: map[string]string{
@@ -341,7 +345,7 @@ func (ip *InstallationProcess) Execute(installPath string) (string, error) {
 			},
 		},
 		Privileged:  true,
-		NetworkMode: "pterodactyl_nw",
+		NetworkMode: container.NetworkMode(config.Get().Docker.Network.Mode),
 	}
 
 	zap.S().Infow("creating installer container for server process", zap.String("server", ip.Server.Uuid))