update dockerfile, remove default debug/symbol stripping, update docker compose defaults

This commit is contained in:
Reese Norris
2024-04-29 13:41:47 -07:00
parent 30748013cd
commit 257d891df5
3 changed files with 6 additions and 7 deletions

View File

@@ -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 CGO_ENABLED=1
ENV GOOS=linux
WORKDIR /build WORKDIR /build
COPY . . COPY . .
@@ -9,7 +8,7 @@ COPY . .
RUN go mod download RUN go mod download
RUN go mod verify 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 FROM gcr.io/distroless/static-debian11

View File

@@ -6,11 +6,11 @@ services:
- "6809:6809/tcp" - "6809:6809/tcp"
- "9086:9086/tcp" - "9086:9086/tcp"
volumes: volumes:
- /opt/fsd/fsd.db:/openfsd/fsd.db - ./db:/openfsd/db
environment: environment:
FSD_ADDR: "0.0.0.0:6809" FSD_ADDR: "0.0.0.0:6809"
HTTP_ADDR: "0.0.0.0:9086" HTTP_ADDR: "0.0.0.0:9086"
HTTPS_ENABLED: false HTTPS_ENABLED: false
DATABASE_FILE: "/fsd/fsd.db" DATABASE_FILE: "./db/fsd.db"
MOTD: "openfsd" MOTD: "openfsd"
restart: always restart: unless-stopped

View File

@@ -25,7 +25,7 @@ type ServerConfig struct {
HttpsEnabled bool `env:"HTTPS_ENABLED, default=false"` HttpsEnabled bool `env:"HTTPS_ENABLED, default=false"`
TLSCertFile string `env:"TLS_CERT_FILE"` TLSCertFile string `env:"TLS_CERT_FILE"`
TLSKeyFile string `env:"TLS_KEY_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"` MOTD string `env:"MOTD, default=openfsd"`
} }