From 257d891df5a3ae0a7446a3dd6e7f5b79390d456c Mon Sep 17 00:00:00 2001 From: Reese Norris Date: Mon, 29 Apr 2024 13:41:47 -0700 Subject: [PATCH] update dockerfile, remove default debug/symbol stripping, update docker compose defaults --- Dockerfile | 5 ++--- docker-compose.yml | 6 +++--- main.go | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index ca09da7..2a73ff4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -FROM golang:1.22.1-bullseye as build +FROM golang:1.22.2-bullseye as build ENV CGO_ENABLED=1 -ENV GOOS=linux WORKDIR /build COPY . . @@ -9,7 +8,7 @@ COPY . . RUN go mod download RUN go mod verify -RUN go build -ldflags='-s -w -extldflags "-static"' -o main . +RUN go build -ldflags='-extldflags "-static"' -o main . FROM gcr.io/distroless/static-debian11 diff --git a/docker-compose.yml b/docker-compose.yml index a9ebc98..7e7bce0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,11 +6,11 @@ services: - "6809:6809/tcp" - "9086:9086/tcp" volumes: - - /opt/fsd/fsd.db:/openfsd/fsd.db + - ./db:/openfsd/db environment: FSD_ADDR: "0.0.0.0:6809" HTTP_ADDR: "0.0.0.0:9086" HTTPS_ENABLED: false - DATABASE_FILE: "/fsd/fsd.db" + DATABASE_FILE: "./db/fsd.db" MOTD: "openfsd" - restart: always + restart: unless-stopped diff --git a/main.go b/main.go index 4acd5a7..08d1a4a 100644 --- a/main.go +++ b/main.go @@ -25,7 +25,7 @@ type ServerConfig struct { HttpsEnabled bool `env:"HTTPS_ENABLED, default=false"` TLSCertFile string `env:"TLS_CERT_FILE"` TLSKeyFile string `env:"TLS_KEY_FILE"` - DatabaseFile string `env:"DATABASE_FILE, default=./fsd.db"` + DatabaseFile string `env:"DATABASE_FILE, default=./db/fsd.db"` MOTD string `env:"MOTD, default=openfsd"` }