Add method to get exit codes

[tester]

environment.go

@@ -70,6 +70,8 @@ type Environment interface {
 	SendCode(code int) error
 
 	GetBase() *BaseEnvironment
+
+	GetLastExitCode() int
 }
 
 type BaseEnvironment struct {
@@ -82,6 +84,7 @@ type BaseEnvironment struct {
 	ExecutionFunction ExecutionFunction  `json:"-"`
 	WaitFunction      func() (err error) `json:"-"`
 	ServerId          string             `json:"-"`
+	LastExitCode      int                `json:"-"`
 }
 
 type ExecutionData struct {
@@ -165,6 +168,10 @@ func (e *BaseEnvironment) GetBase() *BaseEnvironment {
 	return e
 }
 
+func (e *BaseEnvironment) GetLastExitCode() int {
+	return e.LastExitCode
+}
+
 func (e *BaseEnvironment) Log(l *log.Logger, format string, obj ...interface{}) {
 	msg := fmt.Sprintf("[%s] ", e.ServerId) + format
 	l.Printf(msg, obj...)

environments/docker/docker.go

@@ -108,17 +108,17 @@ func (d *docker) dockerExecuteAsync(steps pufferpanel.ExecutionData) error {
 		defer d.connection.Close()
 		wrapper := d.CreateWrapper()
 		_, _ = io.Copy(wrapper, d.connection.Reader)
-		//because we use the auto-delete, we don't manually stop the container
-		//c, _ := d.getClient()
-		//err = c.ContainerStop(context.Background(), d.ContainerId, nil)
-		//if err != nil {
-		//	logging.Error.Printf("Error stopping container "+d.ContainerId, err)
-		//}
+	}()
+
+	go func() {
+		var exitCode int
 
 		okChan, errChan := dockerClient.ContainerWait(ctx, d.ContainerId, container.WaitConditionRemoved)
 		select {
-		case _ = <-okChan:
+		case info := <-okChan:
+			exitCode = cast.ToInt(info.StatusCode)
 		case chanErr := <-errChan:
+			exitCode = 1
 			if chanErr != nil {
 				d.Log(logging.Error, "Error from error channel, awaiting exit `%v`\n", chanErr)
 			}
@@ -130,11 +130,7 @@ func (d *docker) dockerExecuteAsync(steps pufferpanel.ExecutionData) error {
 		_ = d.WSManager.WriteMessage(msg)
 
 		if steps.Callback != nil {
-			if err == nil {
-				steps.Callback(0)
-			} else {
-				steps.Callback(1)
-			}
+			steps.Callback(exitCode)
 		}
 	}()
 
@@ -441,7 +437,7 @@ func (d *docker) createContainer(client *client.Client, ctx context.Context, cmd
 	}
 
 	hostConfig := &container.HostConfig{
-		AutoRemove:   true,
+		//AutoRemove:   true,
 		NetworkMode:  container.NetworkMode(d.NetworkMode),
 		Resources:    d.Resources,
 		Binds:        bindDirs,

environments/standard/standard.go

@@ -200,6 +200,7 @@ func (s *standard) handleClose(callback func(exitCode int)) {
 	} else {
 		exitCode = s.mainProcess.ProcessState.ExitCode()
 	}
+	s.LastExitCode = exitCode
 
 	if s.mainProcess != nil && s.mainProcess.Process != nil {
 		_ = s.mainProcess.Process.Release()

environments/tty/tty.go

@@ -190,6 +190,7 @@ func (t *tty) handleClose(callback func(exitCode int)) {
 	} else {
 		exitCode = t.mainProcess.ProcessState.ExitCode()
 	}
+	t.LastExitCode = exitCode
 
 	if err != nil {
 		t.Log(logging.Error, "Error waiting on process: %s\n", err)

templatetester/main.go

@@ -4,7 +4,9 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/json"
+	"errors"
 	"flag"
+	"fmt"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/pufferpanel/pufferpanel/v3/config"
@@ -184,6 +186,10 @@ func main() {
 		err = runServer(prg)
 		panicIf(err)
 
+		if prg.RunningEnvironment.GetLastExitCode() != 0 {
+			panicIf(errors.New(fmt.Sprintf("exit code status %d", prg.RunningEnvironment.GetLastExitCode())))
+		}
+
 		err = prg.Destroy()
 		panicIf(err)
 	}