Compare commits

...

4 Commits

Author SHA1 Message Date
Jimmy 265879de92 change jar to server.jar 2021-11-27 11:44:56 +13:00
Jimmy 84d7bc4d25 Print java version 2021-11-27 11:44:38 +13:00
Jimmy baea748f90 Update to java 17 2021-11-27 11:44:19 +13:00
Jimmy 0f78b51945 Open socket before defer close 2021-11-12 00:55:15 +13:00
3 changed files with 17 additions and 5 deletions

View File

@ -1,3 +1,4 @@
ARG VERSION=17
FROM golang AS builder
WORKDIR /app
@ -9,8 +10,8 @@ COPY ./go.sum /app
RUN go build -o /app/main /app/src/main.go
RUN go build -o /app/cmd /app/src/cmd.go
ARG JAVA_VERSION=16
FROM openjdk:16
FROM openjdk:$VERSION
ENV MIN_MEM=512M
ENV MAX_MEM=1G

View File

@ -10,7 +10,7 @@ services:
MIN_MEM: 1G
MAX_MEM: 1G
STOP: stop
JAR: jar.jar
JAR: server.jar
REGEX: "Preparing spawn area:"
ports:
- 25565:25565

View File

@ -12,6 +12,7 @@ import (
"syscall"
"log"
"regexp"
"bytes"
"github.com/creack/pty"
)
@ -41,6 +42,14 @@ func main() {
}
}
//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
@ -49,8 +58,8 @@ func main() {
os.Exit(1)
}
//create command
var cmd *exec.Cmd
if args == "" {
cmd = exec.Command("java", minram, maxram, "-jar", jar)
} else {
@ -66,6 +75,8 @@ func main() {
panic(err)
}
ln, _ := net.Listen("tcp", ":8081")
//cleanup
defer func() {
@ -85,7 +96,7 @@ func main() {
}()
//accepts command from cmd.go and sends them to the server
ln, _ := net.Listen("tcp", ":8081")
go func() {
//accept connections from clients
for {