Compare commits
4 Commits
0d05c20961
...
265879de92
Author | SHA1 | Date |
---|---|---|
Jimmy | 265879de92 | |
Jimmy | 84d7bc4d25 | |
Jimmy | baea748f90 | |
Jimmy | 0f78b51945 |
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
15
src/main.go
15
src/main.go
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue