diff --git a/Dockerfile b/Dockerfile index 0b62d6c..8062ee1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM docker.io/golang:1.25.4-alpine AS build -RUN apk add --no-cache upx +RUN apk add --no-cache upx git WORKDIR /src COPY go.mod go.sum ./ @@ -10,7 +10,10 @@ COPY . . RUN go tool templ generate RUN go tool gotailwind -i assets/css/input.css -o assets/css/output.css --minify RUN --mount=type=cache,target=/root/.cache/go-build \ - CGO_ENABLED=0 go build -ldflags="-s" -o /bin/games . + MODULE=$(head -1 go.mod | awk '{print $2}') && \ + VERSION=$(git describe --tags --always) && \ + COMMIT=$(git rev-parse --short HEAD) && \ + CGO_ENABLED=0 go build -ldflags="-s -X $MODULE/version.Version=$VERSION -X $MODULE/version.Commit=$COMMIT" -o /bin/games . RUN upx -9 -k /bin/games FROM scratch diff --git a/features/common/layouts/base.templ b/features/common/layouts/base.templ index 86d563a..5029e7f 100644 --- a/features/common/layouts/base.templ +++ b/features/common/layouts/base.templ @@ -1,6 +1,9 @@ package layouts -import "github.com/ryanhamamura/games/config" +import ( + "github.com/ryanhamamura/games/config" + "github.com/ryanhamamura/games/version" +) templ Base(title string) { @@ -16,6 +19,9 @@ templ Base(title string) {
} { children... } + } diff --git a/main.go b/main.go index 041e13c..9170eb1 100644 --- a/main.go +++ b/main.go @@ -20,6 +20,7 @@ import ( "github.com/ryanhamamura/games/router" "github.com/ryanhamamura/games/sessions" "github.com/ryanhamamura/games/snake" + "github.com/ryanhamamura/games/version" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" @@ -45,7 +46,7 @@ func main() { func run(ctx context.Context) error { cfg := config.Global addr := fmt.Sprintf("%s:%s", cfg.Host, cfg.Port) - slog.Info("server starting", "addr", addr) + slog.Info("server starting", "addr", addr, "version", version.Version, "commit", version.Commit) defer slog.Info("server shutdown complete") eg, egctx := errgroup.WithContext(ctx) diff --git a/version/version.go b/version/version.go new file mode 100644 index 0000000..6ce8a01 --- /dev/null +++ b/version/version.go @@ -0,0 +1,10 @@ +// Package version holds build-time version information injected via ldflags. +package version + +// Version and Commit are set at build time via: +// +// -ldflags "-X github.com/ryanhamamura/games/version.Version=... -X github.com/ryanhamamura/games/version.Commit=..." +var ( + Version = "dev" + Commit = "unknown" +)