Compare commits
7 Commits
17dd869ff3
...
88718390fa
Author | SHA1 | Date |
---|---|---|
Jimmy | 88718390fa | |
Jimmy | 1075fac43f | |
Jimmy | 23294760b6 | |
Jimmy | 119251c799 | |
Jimmy | dbe6362fc7 | |
Jimmy | 8c4a434afd | |
Jimmy | 082084dd13 |
20
Dockerfile
20
Dockerfile
|
@ -1,16 +1,30 @@
|
|||
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
|
||||
|
||||
ARG JAVA_VERSION=16
|
||||
FROM openjdk:${JAVA_VERSION}
|
||||
FROM openjdk:16
|
||||
|
||||
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 --from=builder /app/main /main
|
||||
COPY --from=builder /app/cmd /usr/local/bin/cmd
|
||||
|
||||
EXPOSE 25565
|
||||
|
||||
VOLUME [ "/server" ]
|
||||
|
||||
WORKDIR /server
|
||||
|
||||
ENTRYPOINT [ "/main" ]
|
||||
|
|
|
@ -37,7 +37,7 @@ To detach use ```ctrl+p ctrl+q```
|
|||
|
||||
Don't use ```ctrl+c``` to disconnect, it will kill the server
|
||||
|
||||
## Varialbles
|
||||
## Environmental Variables
|
||||
|
||||
### JAR
|
||||
|
||||
|
@ -55,6 +55,6 @@ Default is ```1G```
|
|||
|
||||
Default is ```stop```
|
||||
|
||||
This would be used for the Bungee where the stop command is ```end```
|
||||
This would be used for Bungee where the stop command is ```end```
|
||||
|
||||
|
||||
|
|
4
build.sh
4
build.sh
|
@ -1,6 +1,2 @@
|
|||
#!/bin/sh
|
||||
|
||||
mkdir -p bin && \
|
||||
go build -o bin/main src/main.go && \
|
||||
go build -o bin/cmd src/cmd.go && \
|
||||
sudo docker build -t magmise/minecraft:latest .
|
||||
|
|
|
@ -4,12 +4,14 @@ services:
|
|||
minecraft:
|
||||
image: magmise/minecraft:latest
|
||||
container_name: minecraft
|
||||
build: .
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
MIN_MEM: 1G
|
||||
MAX_MEM: 1G
|
||||
STOP: stop
|
||||
JAR: server.jar
|
||||
JAR: jar.jar
|
||||
REGEX: "Preparing spawn area:"
|
||||
ports:
|
||||
- 25565:25565
|
||||
volumes:
|
||||
|
|
44
src/main.go
44
src/main.go
|
@ -11,16 +11,17 @@ import (
|
|||
"strings"
|
||||
"syscall"
|
||||
"log"
|
||||
"regexp"
|
||||
|
||||
"github.com/creack/pty"
|
||||
)
|
||||
|
||||
func main() {
|
||||
log.Println("Starting Server")
|
||||
log.Println("\033[32mStarting Server\033[0m")
|
||||
sigs := make(chan os.Signal, 1)
|
||||
signal.Notify(sigs, syscall.SIGTERM)
|
||||
|
||||
var minram, maxram, args, stop, jar string
|
||||
var minram, maxram, args, stop, jar, regex string
|
||||
for _, e := range os.Environ() {
|
||||
pair := strings.SplitN(e, "=", 2)
|
||||
switch pair[0] {
|
||||
|
@ -34,25 +35,37 @@ func main() {
|
|||
stop = pair[1]
|
||||
case "JAR":
|
||||
jar = pair[1]
|
||||
case "REGEX":
|
||||
regex = pair[1]
|
||||
}
|
||||
|
||||
}
|
||||
log.Printf("Ram: Min: %s Max: %s Stop: %s Jar: %s\n\rArgs: %s", minram, maxram, stop, jar, args)
|
||||
|
||||
|
||||
log.Printf("Ram: Min: %s Max: %s Stop: %s Jar: %s\n\r", minram, maxram, stop, 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)
|
||||
}
|
||||
|
||||
|
||||
cmd.Dir = "/server"
|
||||
cmd.Stdout = os.Stdout
|
||||
tty, err := pty.Start(cmd)
|
||||
ln, _ := net.Listen("tcp", ":8081")
|
||||
|
||||
if err != nil {
|
||||
panic(err)
|
||||
|
||||
}
|
||||
|
||||
defer func() {
|
||||
|
@ -62,10 +75,11 @@ 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")
|
||||
}
|
||||
}()
|
||||
|
@ -81,12 +95,28 @@ func main() {
|
|||
}
|
||||
}()
|
||||
|
||||
|
||||
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 {
|
||||
io.Copy(os.Stdout, tty)
|
||||
}
|
||||
}()
|
||||
|
||||
go func() {
|
||||
io.Copy(tty, os.Stdin)
|
||||
}()
|
||||
|
||||
cmd.Wait()
|
||||
tty.Write([]byte("Server Stopped"))
|
||||
tty.Write([]byte("\033[31mServer Stopped\033[0m"))
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue