From 826f296e052ff8787de42ba259409b8c6309b5ae Mon Sep 17 00:00:00 2001 From: Robin Dittmar Date: Mon, 20 Jul 2026 22:32:53 +0200 Subject: [PATCH 1/3] fix: added .env file for default docker setup --- .env.docker | 1 + Dockerfile | 1 + 2 files changed, 2 insertions(+) create mode 100644 .env.docker diff --git a/.env.docker b/.env.docker new file mode 100644 index 0000000..8ae493a --- /dev/null +++ b/.env.docker @@ -0,0 +1 @@ +DTTMR_DATABASE_URL=postgres://postgres:postgres@172.17.0.1:5432/postgres?sslmode=disable&timezone=utc \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index a6579e6..75f6153 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ FROM debian:latest WORKDIR /app +COPY .env.docker .env COPY --from=build /app/server /app/server EXPOSE 8080 From addbbb9cbe1f958fb223915ca47e960e4791a839 Mon Sep 17 00:00:00 2001 From: Robin Dittmar Date: Mon, 20 Jul 2026 22:49:55 +0200 Subject: [PATCH 2/3] fix: "service shutdown" log is now always last on proper shutdown --- cmd/api-server/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/api-server/main.go b/cmd/api-server/main.go index 0c0df32..9cf1dab 100644 --- a/cmd/api-server/main.go +++ b/cmd/api-server/main.go @@ -36,6 +36,7 @@ func run(serviceName string, serviceVersion string) error { setupLogging() slog.Info("starting service", slog.String("service", serviceName), slog.String("version", serviceVersion)) + defer slog.Info("service shutdown!") cfg := config.Load() @@ -97,7 +98,6 @@ func run(serviceName string, serviceVersion string) error { return err } - slog.Info("service shutdown successful!") return nil } From 866f416243b722aa6e2a6290d30691264a0565a3 Mon Sep 17 00:00:00 2001 From: Robin Dittmar Date: Mon, 20 Jul 2026 22:50:41 +0200 Subject: [PATCH 3/3] fix: added .env file to docker build --- .env.docker | 3 ++- Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.env.docker b/.env.docker index 8ae493a..d8f120f 100644 --- a/.env.docker +++ b/.env.docker @@ -1 +1,2 @@ -DTTMR_DATABASE_URL=postgres://postgres:postgres@172.17.0.1:5432/postgres?sslmode=disable&timezone=utc \ No newline at end of file +DTTMR_OTLP_ENDPOINT=172.17.0.1:4317 +DTTMR_DATABASE_URL=postgres://postgres:postgres@172.17.0.1:5432/postgres?sslmode=disable&timezone=utc diff --git a/Dockerfile b/Dockerfile index 75f6153..b5d75a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,8 @@ COPY go.mod go.sum ./ RUN go mod download -COPY . . +COPY "./internal" "./internal" +COPY "./cmd" "./cmd" RUN go build -o ./server github.com/robindittmar/dttmr-api/cmd/api-server