diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index 668a388..0000000 --- a/.tool-versions +++ /dev/null @@ -1 +0,0 @@ -golang 1.24.1 diff --git a/Dockerfile b/Dockerfile index ce17f26..261d6c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -FROM alpine:3.21 - -RUN apk update && apk add wine xvfb winetricks golang +FROM scottyhardy/docker-wine:stable-9.0-20240915 ARG SQL_ADDRESS ARG SQL_ACCOUNT @@ -11,6 +9,9 @@ ARG SERVER_NAME WORKDIR /usr/src/app +# Install dependencies +RUN apt-get update && apt-get install golang-go xvfb -y + # Start display for headless wine RUN Xvfb :0 -screen 0 1024x768x16 & # Install wine dependencies diff --git a/main.go b/main.go index 3fcadad..042fc15 100644 --- a/main.go +++ b/main.go @@ -24,7 +24,7 @@ func main() { wg.Add(1) go func(executable string) { fmt.Printf("Starting %v...\n", bin) - cmd := exec.Command("xvfb-run wine " + cwd + "/deploy/" + executable + ".exe") cmd.Stdout = os.Stdout + cmd := exec.Command(cwd + "/deploy/" + executable + ".exe") cmd.Stdout = os.Stdout if err := cmd.Run(); err != nil { fmt.Println(err.Error()) os.Exit(1)