diff --git a/Dockerfile b/Dockerfile index b44d655..9e4b6a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,10 @@ # try to keep the debian version in sync with the distroless version FROM golang:1.23-bookworm as base +ARG VERSION=development + +WORKDIR /work + COPY go.mod ./ COPY go.sum ./ RUN go mod download @@ -18,12 +22,12 @@ RUN go test -v # Stage to build the binary FROM base as build -RUN CGO_ENABLED=0 go build -o /go/bin/app . +RUN CGO_ENABLED=0 go build -ldflags="-X 'github.com/blackskad/go-web-scaffold/environment.Version=${VERSION}'" -o app . # Stage with the production binary FROM gcr.io/distroless/static-debian12 as production -COPY --from=build /go/bin/app / +COPY --from=build /work/app / # port for pprof EXPOSE 6060 diff --git a/docker-compose.yaml b/docker-compose.yaml index a3742dd..7f8140d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,5 +1,5 @@ services: - quasar: + go-web-scaffold: build: dockerfile: Dockerfile target: production diff --git a/pkg/environment/environment.go b/pkg/environment/environment.go index 0bb10b9..595acb2 100644 --- a/pkg/environment/environment.go +++ b/pkg/environment/environment.go @@ -1,3 +1,4 @@ package environment -const Name = "quasar" +const Name = "go-web-scaffold" +const Version = "development" diff --git a/pkg/o11y/otel.go b/pkg/o11y/otel.go index d7f492d..0e477ab 100644 --- a/pkg/o11y/otel.go +++ b/pkg/o11y/otel.go @@ -31,6 +31,7 @@ func initTracer(ctx context.Context) (*sdktrace.TracerProvider, error) { resource.NewWithAttributes( semconv.SchemaURL, semconv.ServiceName(environment.Name), + semconv.ServiceVersion(environment.Version), ), ), }