Skip to content

Commit 87e2b52

Browse files
committed
fix: set gin mode correctly
1 parent f36b625 commit 87e2b52

6 files changed

Lines changed: 25 additions & 15 deletions

File tree

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
- name: Build
9090
run: |
9191
cp -r frontend/dist internal/assets/dist
92-
go build -ldflags "-s -w -X tinyauth/internal/config.Version=${{ needs.generate-metadata.outputs.VERSION }} -X tinyauth/internal/config.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X tinyauth/internal/config.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-amd64 ./cmd/tinyauth
92+
go build -ldflags "-s -w -X github.com/steveiliop56/tinyauth/internal/config.Version=${{ needs.generate-metadata.outputs.VERSION }} -X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X github.com/steveiliop56/tinyauth/internal/config.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-amd64 ./cmd/tinyauth
9393
env:
9494
CGO_ENABLED: 0
9595

@@ -144,7 +144,7 @@ jobs:
144144
- name: Build
145145
run: |
146146
cp -r frontend/dist internal/assets/dist
147-
go build -ldflags "-s -w -X tinyauth/internal/config.Version=${{ needs.generate-metadata.outputs.VERSION }} -X tinyauth/internal/config.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X tinyauth/internal/config.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-arm64 ./cmd/tinyauth
147+
go build -ldflags "-s -w -X github.com/steveiliop56/tinyauth/internal/config.Version=${{ needs.generate-metadata.outputs.VERSION }} -X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X github.com/steveiliop56/tinyauth/internal/config.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-arm64 ./cmd/tinyauth
148148
env:
149149
CGO_ENABLED: 0
150150

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- name: Build
6868
run: |
6969
cp -r frontend/dist internal/assets/dist
70-
go build -ldflags "-s -w -X tinyauth/internal/config.Version=${{ needs.generate-metadata.outputs.VERSION }} -X tinyauth/internal/config.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X tinyauth/internal/config.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-amd64 ./cmd/tinyauth
70+
go build -ldflags "-s -w -X github.com/steveiliop56/tinyauth/internal/config.Version=${{ needs.generate-metadata.outputs.VERSION }} -X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X github.com/steveiliop56/tinyauth/internal/config.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-amd64 ./cmd/tinyauth
7171
env:
7272
CGO_ENABLED: 0
7373

@@ -119,7 +119,7 @@ jobs:
119119
- name: Build
120120
run: |
121121
cp -r frontend/dist internal/assets/dist
122-
go build -ldflags "-s -w -X tinyauth/internal/config.Version=${{ needs.generate-metadata.outputs.VERSION }} -X tinyauth/internal/config.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X tinyauth/internal/config.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-arm64 ./cmd/tinyauth
122+
go build -ldflags "-s -w -X github.com/steveiliop56/tinyauth/internal/config.Version=${{ needs.generate-metadata.outputs.VERSION }} -X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${{ needs.generate-metadata.outputs.COMMIT_HASH }} -X github.com/steveiliop56/tinyauth/internal/config.BuildTimestamp=${{ needs.generate-metadata.outputs.BUILD_TIMESTAMP }}" -o tinyauth-arm64 ./cmd/tinyauth
123123
env:
124124
CGO_ENABLED: 0
125125

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ COPY ./cmd ./cmd
3939
COPY ./internal ./internal
4040
COPY --from=frontend-builder /frontend/dist ./internal/assets/dist
4141

42-
RUN CGO_ENABLED=0 go build -ldflags "-s -w -X tinyauth/internal/config.Version=${VERSION} -X tinyauth/internal/config.CommitHash=${COMMIT_HASH} -X tinyauth/internal/config.BuildTimestamp=${BUILD_TIMESTAMP}" ./cmd/tinyauth
42+
RUN CGO_ENABLED=0 go build -ldflags "-s -w \
43+
-X github.com/steveiliop56/tinyauth/internal/config.Version=${VERSION} \
44+
-X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${COMMIT_HASH} \
45+
-X github.com/steveiliop56/tinyauth/internal/config.BuildTimestamp=${BUILD_TIMESTAMP}" ./cmd/tinyauth
4346

4447
# Runner
4548
FROM alpine:3.23 AS runner
@@ -54,11 +57,9 @@ EXPOSE 3000
5457

5558
VOLUME ["/data"]
5659

57-
ENV DATABASEPATH=/data/tinyauth.db
60+
ENV TINYAUTH_DATABASEPATH=/data/tinyauth.db
5861

59-
ENV RESOURCESDIR=/data/resources
60-
61-
ENV GIN_MODE=release
62+
ENV TINYAUTH_RESOURCESDIR=/data/resources
6263

6364
ENV PATH=$PATH:/tinyauth
6465

Dockerfile.distroless

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ COPY --from=frontend-builder /frontend/dist ./internal/assets/dist
4141

4242
RUN mkdir -p data
4343

44-
RUN CGO_ENABLED=0 go build -ldflags "-s -w -X tinyauth/internal/config.Version=${VERSION} -X tinyauth/internal/config.CommitHash=${COMMIT_HASH} -X tinyauth/internal/config.BuildTimestamp=${BUILD_TIMESTAMP}" ./cmd/tinyauth
44+
RUN CGO_ENABLED=0 go build -ldflags "-s -w \
45+
-X github.com/steveiliop56/tinyauth/internal/config.Version=${VERSION} \
46+
-X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${COMMIT_HASH} \
47+
-X github.com/steveiliop56/tinyauth/internal/config.BuildTimestamp=${BUILD_TIMESTAMP}" ./cmd/tinyauth
4548

4649
# Runner
4750
FROM gcr.io/distroless/static-debian12:latest AS runner
@@ -61,8 +64,6 @@ ENV TINYAUTH_DATABASEPATH=/data/tinyauth.db
6164

6265
ENV TINYAUTH_RESOURCESDIR=/data/resources
6366

64-
ENV GIN_MODE=release
65-
6667
ENV PATH=$PATH:/tinyauth
6768

6869
HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 CMD ["tinyauth", "healthcheck"]

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ webui: clean-webui
3131
# Build the binary
3232
binary: webui
3333
CGO_ENABLED=$(CGO_ENABLED) go build -ldflags "-s -w \
34-
-X tinyauth/internal/config.Version=${TAG_NAME} \
35-
-X tinyauth/internal/config.CommitHash=${COMMIT_HASH} \
36-
-X tinyauth/internal/config.BuildTimestamp=${BUILD_TIMESTAMP}" \
34+
-X github.com/steveiliop56/tinyauth/internal/config.Version=${TAG_NAME} \
35+
-X github.com/steveiliop56/tinyauth/internal/config.CommitHash=${COMMIT_HASH} \
36+
-X github.com/steveiliop56/tinyauth/internal/config.BuildTimestamp=${BUILD_TIMESTAMP}" \
3737
-o ${BIN_NAME} ./cmd/tinyauth
3838

3939
# Build for amd64

internal/bootstrap/router_bootstrap.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@ package bootstrap
22

33
import (
44
"fmt"
5+
"slices"
56

7+
"github.com/steveiliop56/tinyauth/internal/config"
68
"github.com/steveiliop56/tinyauth/internal/controller"
79
"github.com/steveiliop56/tinyauth/internal/middleware"
810

911
"github.com/gin-gonic/gin"
1012
)
1113

14+
var DEV_MODES = []string{"main", "test", "development"}
15+
1216
func (app *BootstrapApp) setupRouter() (*gin.Engine, error) {
17+
if !slices.Contains(DEV_MODES, config.Version) {
18+
gin.SetMode(gin.ReleaseMode)
19+
}
20+
1321
engine := gin.New()
1422
engine.Use(gin.Recovery())
1523

0 commit comments

Comments
 (0)