From 56f4381eb95e555e031742caf03c9c675c53a812 Mon Sep 17 00:00:00 2001 From: SuperMarioDaBom Date: Sun, 16 Jul 2023 21:25:43 -0700 Subject: [PATCH 1/2] Dockerize --- .dockerignore | 7 +++++++ Dockerfile | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..a63fa03 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,7 @@ +.env +.git +build +log +go.work +*.test +go.work.sum \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..dcd440c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,19 @@ +# --- builder --- +FROM golang:1.20.6-alpine3.17 as builder +LABEL stage=builder +RUN apk add git +WORKDIR /build + +COPY go.* ./ +RUN go mod download + +COPY . ./ +ARG BUILD_STRING=pretendo.friends.docker +RUN go build -ldflags "-X 'main.serverBuildString=${BUILD_STRING}'" -v -o server + +# --- runner --- +FROM alpine:3.17 as runner +WORKDIR /build + +COPY --from=builder /build/server /build/ +CMD ["/build/server"] From 91816691dea86400912d9508be240acd3ea7c567 Mon Sep 17 00:00:00 2001 From: SuperMarioDaBom Date: Sun, 16 Jul 2023 22:11:42 -0700 Subject: [PATCH 2/2] Prevent execution from stopping when no .env file is present --- init.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.go b/init.go index ebee941..5e62f94 100644 --- a/init.go +++ b/init.go @@ -19,7 +19,7 @@ func init() { err = godotenv.Load() if err != nil { - log.Fatal("Error loading .env file") + globals.Logger.Warning("Error loading .env file") } globals.AESKey, err = hex.DecodeString(os.Getenv("PN_FRIENDS_CONFIG_AES_KEY"))