From d83ace159427a3bd1179f14200a4fdaa72a9c0d1 Mon Sep 17 00:00:00 2001 From: Stavros Date: Wed, 27 May 2026 11:32:54 +0300 Subject: [PATCH 1/2] chore: include debug symbols in nightly images --- .github/workflows/nightly.yml | 4 ++-- .github/workflows/release.yml | 4 ++++ Dockerfile | 3 ++- Dockerfile.distroless | 3 ++- Makefile | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 26ac79bc..dd2fc416 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -83,7 +83,7 @@ jobs: - name: Build run: | cp -r frontend/dist internal/assets/dist - go build -ldflags "-s -w -X github.com/tinyauthapp/tinyauth/internal/model.Version=${{ needs.generate-metadata.outputs.VERSION }} -X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X github.com/tinyauthapp/tinyauth/internal/model.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-amd64 ./cmd/tinyauth + go build -ldflags "-X github.com/tinyauthapp/tinyauth/internal/model.Version=${{ needs.generate-metadata.outputs.VERSION }} -X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X github.com/tinyauthapp/tinyauth/internal/model.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-amd64 ./cmd/tinyauth env: CGO_ENABLED: 0 @@ -128,7 +128,7 @@ jobs: - name: Build run: | cp -r frontend/dist internal/assets/dist - go build -ldflags "-s -w -X github.com/tinyauthapp/tinyauth/internal/model.Version=${{ needs.generate-metadata.outputs.VERSION }} -X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X github.com/tinyauthapp/tinyauth/internal/model.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-arm64 ./cmd/tinyauth + go build -ldflags "-X github.com/tinyauthapp/tinyauth/internal/model.Version=${{ needs.generate-metadata.outputs.VERSION }} -X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X github.com/tinyauthapp/tinyauth/internal/model.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-arm64 ./cmd/tinyauth env: CGO_ENABLED: 0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d502db6b..9896a599 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,6 +150,7 @@ jobs: VERSION=${{ needs.generate-metadata.outputs.VERSION }} COMMIT_HASH=${{ needs.generate-metadata.outputs.COMMIT_HASH }} BUILD_TIMESTAMP=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }} + LDFLAGS="-s -w" - name: Export digest run: | @@ -206,6 +207,7 @@ jobs: VERSION=${{ needs.generate-metadata.outputs.VERSION }} COMMIT_HASH=${{ needs.generate-metadata.outputs.COMMIT_HASH }} BUILD_TIMESTAMP=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }} + LDFLAGS="-s -w" - name: Export digest run: | @@ -260,6 +262,7 @@ jobs: VERSION=${{ needs.generate-metadata.outputs.VERSION }} COMMIT_HASH=${{ needs.generate-metadata.outputs.COMMIT_HASH }} BUILD_TIMESTAMP=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }} + LDFLAGS="-s -w" - name: Export digest run: | @@ -316,6 +319,7 @@ jobs: VERSION=${{ needs.generate-metadata.outputs.VERSION }} COMMIT_HASH=${{ needs.generate-metadata.outputs.COMMIT_HASH }} BUILD_TIMESTAMP=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }} + LDFLAGS="-s -w" - name: Export digest run: | diff --git a/Dockerfile b/Dockerfile index 98508304..22ea6c46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ FROM golang:1.26-alpine3.23 AS builder ARG VERSION ARG COMMIT_HASH ARG BUILD_TIMESTAMP +ARG LDFLAGS WORKDIR /tinyauth @@ -39,7 +40,7 @@ COPY ./cmd ./cmd COPY ./internal ./internal COPY --from=frontend-builder /frontend/dist ./internal/assets/dist -RUN CGO_ENABLED=0 go build -ldflags "-s -w \ +RUN CGO_ENABLED=0 go build -ldflags "${LDFLAGS}} \ -X github.com/tinyauthapp/tinyauth/internal/model.Version=${VERSION} \ -X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${COMMIT_HASH} \ -X github.com/tinyauthapp/tinyauth/internal/model.BuildTimestamp=${BUILD_TIMESTAMP}" ./cmd/tinyauth diff --git a/Dockerfile.distroless b/Dockerfile.distroless index a3655b15..be095a35 100644 --- a/Dockerfile.distroless +++ b/Dockerfile.distroless @@ -27,6 +27,7 @@ FROM golang:1.26-alpine3.23 AS builder ARG VERSION ARG COMMIT_HASH ARG BUILD_TIMESTAMP +ARG LDFLAGS WORKDIR /tinyauth @@ -41,7 +42,7 @@ COPY --from=frontend-builder /frontend/dist ./internal/assets/dist RUN mkdir -p data -RUN CGO_ENABLED=0 go build -ldflags "-s -w \ +RUN CGO_ENABLED=0 go build -ldflags "${LDFLAGS}} \ -X github.com/tinyauthapp/tinyauth/internal/model.Version=${VERSION} \ -X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${COMMIT_HASH} \ -X github.com/tinyauthapp/tinyauth/internal/model.BuildTimestamp=${BUILD_TIMESTAMP}" ./cmd/tinyauth diff --git a/Makefile b/Makefile index 3401ab06..375b2def 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ TAG_NAME := $(shell git describe --abbrev=0 --exact-match 2> /dev/null || echo " COMMIT_HASH := $(shell git rev-parse HEAD) BUILD_TIMESTAMP := $(shell date '+%Y-%m-%dT%H:%M:%S') BIN_NAME := tinyauth-$(GOARCH) +LDFLAGS := -s -w # Development vars DEV_COMPOSE := $(shell test -f "docker-compose.test.yml" && echo "docker-compose.test.yml" || echo "docker-compose.dev.yml" ) @@ -36,7 +37,7 @@ webui: clean-webui # Build the binary binary: webui - CGO_ENABLED=$(CGO_ENABLED) go build -ldflags "-s -w \ + CGO_ENABLED=$(CGO_ENABLED) go build -ldflags "${LDFLAGS} \ -X github.com/tinyauthapp/tinyauth/internal/model.Version=${TAG_NAME} \ -X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${COMMIT_HASH} \ -X github.com/tinyauthapp/tinyauth/internal/model.BuildTimestamp=${BUILD_TIMESTAMP}" \ From 54cf131f68f9eb376bff64b543a228eb18a06fff Mon Sep 17 00:00:00 2001 From: Stavros Date: Wed, 27 May 2026 11:40:23 +0300 Subject: [PATCH 2/2] fix: review comments --- Dockerfile | 2 +- Dockerfile.distroless | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 22ea6c46..b0253fe7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ COPY ./cmd ./cmd COPY ./internal ./internal COPY --from=frontend-builder /frontend/dist ./internal/assets/dist -RUN CGO_ENABLED=0 go build -ldflags "${LDFLAGS}} \ +RUN CGO_ENABLED=0 go build -ldflags "${LDFLAGS} \ -X github.com/tinyauthapp/tinyauth/internal/model.Version=${VERSION} \ -X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${COMMIT_HASH} \ -X github.com/tinyauthapp/tinyauth/internal/model.BuildTimestamp=${BUILD_TIMESTAMP}" ./cmd/tinyauth diff --git a/Dockerfile.distroless b/Dockerfile.distroless index be095a35..f069ae17 100644 --- a/Dockerfile.distroless +++ b/Dockerfile.distroless @@ -42,7 +42,7 @@ COPY --from=frontend-builder /frontend/dist ./internal/assets/dist RUN mkdir -p data -RUN CGO_ENABLED=0 go build -ldflags "${LDFLAGS}} \ +RUN CGO_ENABLED=0 go build -ldflags "${LDFLAGS} \ -X github.com/tinyauthapp/tinyauth/internal/model.Version=${VERSION} \ -X github.com/tinyauthapp/tinyauth/internal/model.CommitHash=${COMMIT_HASH} \ -X github.com/tinyauthapp/tinyauth/internal/model.BuildTimestamp=${BUILD_TIMESTAMP}" ./cmd/tinyauth