Change to CMD

.gitignore

@@ -1,17 +1,2 @@
-# ---> Go
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-
+server/*
+bin/*

Dockerfile

@@ -1,18 +1,31 @@
-ARG JAVA_VERSION=14.0.2
-FROM java:${JAVA_VERSION}
+ARG VERSION=17
+FROM golang AS builder
+
+WORKDIR /app
+
+COPY ./src /app/src
+COPY ./go.mod /app
+COPY ./go.sum /app
+
+RUN go build -o /app/main /app/src/main.go 
+RUN go build -o /app/cmd /app/src/cmd.go 
+
+
+FROM openjdk:$VERSION
 
 ENV MIN_MEM=512M
 ENV MAX_MEM=1G
 ENV STOP="stop"
-
 ENV JAR=server.jar
+ENV REGEX=""
 
-COPY ./bin/main /main
-COPY ./bin/cmd /usr/local/bin/cmd
-COPY ./entry.sh /entry.sh
+COPY --from=builder /app/main /main
+COPY --from=builder /app/cmd /usr/local/bin/cmd
 
 EXPOSE 25565
 
 VOLUME [ "/server" ]
 
-ENTRYPOINT [ "/main" ]
+WORKDIR /server
+
+CMD [ "/main" ]

README.md

@@ -1,3 +1,60 @@
-# minecraftimage
+# Docker Minecraft
+
+Wrapper to run Minecraft in Docker
+
+
+## Build Image
+
+```./build.sh```
+
+## Get Minecraft Sever For Testing
+
+```./get_minecraft.sh```
+
+## Run Server
+
+```docker-compose up -d```
+
+```docker run -it --name minecraft -p 25565:25565 -v $PWD:/server -e MAX_MEM=1G magmise/minecraft```
+
+## Get Logs
+
+```docker-compose logs```
+
+```docker logs minecraft```
+
+## Send Command to Server
+
+```docker-compose exec cmd say hello```
+
+```docker exec minecraft cmd say hello```
+
+## Attach to Container
+
+```docker attach minecraft```
+
+To detach use ```ctrl+p ctrl+q```
+
+Don't use ```ctrl+c``` to disconnect, it will kill the server
+
+## Environmental Variables
+
+### JAR
+
+Default is ```server.jar```
+
+### MIN_MEM
+
+Default is ```512M```
+
+### MAX_MEM
+
+Default is ```1G```
+
+### STOP
+
+Default is ```stop```
+
+This would be used for Bungee where the stop command is ```end```
+
 
-Docker wrapper to run Minecraft in Docker

build.sh

@@ -1,5 +1,2 @@
 #!/bin/sh
-
-go build -o bin/main src/main.go
-go build -o bin/cmd src/cmd.go
-sudo docker build -t magmise/minecraft .
+sudo docker build -t magmise/minecraft:latest .

docker-compose.yml

@@ -1,13 +1,17 @@
 version: '3.7'
 
-
 services:
     minecraft:
-      image: magmise/minecraft
+      image: magmise/minecraft:latest
       container_name: minecraft
+      build: .
       restart: unless-stopped
       environment: 
+        MIN_MEM: 1G
         MAX_MEM: 1G
+        STOP: stop
+        JAR: server.jar
+        REGEX: "Preparing spawn area:"
       ports:
         - 25565:25565
       volumes: 

get_minecraft.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+mkdir server
+wget https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar -O server/server.jar
+echo eula=true > server/eula.txt

src/main.go

@@ -10,15 +10,20 @@ import (
 	"os/signal"
 	"strings"
 	"syscall"
+	"log"
+	"regexp"
+	"bytes"
 
 	"github.com/creack/pty"
 )
 
 func main() {
+	log.Println("\033[32mStarting Server\033[0m")
 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs, syscall.SIGTERM)
 
-	var minram, maxram, args, stop string
+	//get environmental variables
+	var minram, maxram, args, stop, jar, regex string
 	for _, e := range os.Environ() {
 		pair := strings.SplitN(e, "=", 2)
 		switch pair[0] {
@@ -30,24 +35,50 @@ func main() {
 			args = pair[1]
 		case "STOP":
 			stop = pair[1]
+		case "JAR":
+			jar = pair[1]
+		case "REGEX":
+			regex = pair[1]
 		}
 	}
-	var cmd *exec.Cmd
-	if args == "" {
-		cmd = exec.Command("java", minram, maxram, "-jar", "server.jar")
-	} else {
-		cmd = exec.Command("java", minram, maxram, args, "-jar", "server.jar")
+
+	//create command
+	var cmdversion *exec.Cmd
+	cmdversion = exec.Command("java", "--version")
+	var out bytes.Buffer
+	cmdversion.Stdout = &out
+	cmdversion.Run()
+	log.Println(out.String())
+
+	log.Printf("Ram: Min: %s Max: %s Stop: %s Jar: %s\n\r", minram, maxram, stop, jar)
+
+	//check if there is a server jar
+	if _, err := os.Stat("/server/"+jar); os.IsNotExist(err) {
+		log.Println("\033[31mJar \"" + jar + "\" not found\033[0m")
+		os.Exit(1)
 	}
 	
+	var cmd *exec.Cmd
+	
+	if args == "" {
+		cmd = exec.Command("java", minram, maxram, "-jar", jar)
+	} else {
+		cmd = exec.Command("java", minram, maxram, args, "-jar", jar)
+		log.Printf("Args: %s \n\r", args)
+	}
+
+	//start server
 	cmd.Dir = "/server"
-	cmd.Stdout = os.Stdout
 	tty, err := pty.Start(cmd)
-	ln, _ := net.Listen("tcp", ":8081")
 	
 	if err != nil {
 		panic(err)
+	
 	}
 
+	ln, _ := net.Listen("tcp", ":8081")
+	
+	//cleanup
 	defer func() {
 		cmd.Process.Kill()
 		cmd.Process.Wait()
@@ -55,14 +86,17 @@ func main() {
 		ln.Close()
 	}()
 
+	// capture sigterm
 	go func() {
 		sig := <-sigs
 		if sig == syscall.SIGTERM {
-			fmt.Println("Stopping server")
+			fmt.Println("\033[31mStopping server\033[0m")
 			tty.WriteString(stop + "\n\r")
 		}
 	}()
 
+	//accepts command from cmd.go and sends them to the server
+	
 	go func() {
 		//accept connections from clients
 		for {
@@ -74,14 +108,33 @@ func main() {
 		}
 	}()
 
+	//copy to standard out. If the the is a regex pattern, do output anything that matches
+	go func() {
+		filter := regexp.MustCompile(regex)
+		if(regex != "") {
+			scanner := bufio.NewScanner(tty)
+			for scanner.Scan() {
+				text := scanner.Text()
+				if(!filter.MatchString(text)) {
+					fmt.Println(text)
+				}
+			}
+		} else { //don't filter
+			io.Copy(os.Stdout, tty)
+		}
+	}()
+
+	//copy stdin
 	go func() {
 		io.Copy(tty, os.Stdin)
 	}()
 
-	cmd.Wait()
+	cmd.Wait() //wait for server to stop
+	tty.Write([]byte("\033[31mServer Stopped\033[0m"))
 	os.Exit(0)
 }
 
+//take commands from cmd.go and send it to sdtin of the server
 func handleClient(conn net.Conn, tty *os.File) {
 	defer conn.Close()
 	cmd, _ := bufio.NewReader(conn).ReadString('\n')