From 4b75edc7545a14a69abacc4bd8096d75171f9cb7 Mon Sep 17 00:00:00 2001 From: Julien Riou Date: Fri, 22 Aug 2025 07:57:08 +0200 Subject: [PATCH] Add Dockerfile - Add Docker image - Fix whitespace location in the footer when version is not provided - Add log message when the server is about to start Signed-off-by: Julien Riou --- Dockerfile | 16 ++++++++++++++++ src/server/server.go | 1 + src/server/templates/footer.html | 4 ++-- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..274d2a4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +FROM golang:1.24-bookworm AS builder + +RUN apt-get update && apt-get install -y libx11-dev && apt-get clean + +COPY . /usr/app +COPY .git/ /usr/app/.git +WORKDIR /usr/app +RUN make + +FROM debian:12 AS final + +COPY --from=builder /usr/app/bin/collerd /usr/local/bin/collerd +COPY --from=builder /usr/app/bin/coller /usr/local/bin/coller +COPY --from=builder /usr/app/bin/copier /usr/local/bin/copier + +CMD ["collerd"] diff --git a/src/server/server.go b/src/server/server.go index 27b6b66..05e05da 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -347,5 +347,6 @@ func (s *Server) Start() error { r.Path("/").Handler(&HomeHandler{Templates: templates, PageData: p}).Methods("GET") addr := fmt.Sprintf("%s:%d", s.config.ListenAddress, s.config.ListenPort) + s.logger.Info(fmt.Sprintf("listening to %s:%d", s.config.ListenAddress, s.config.ListenPort)) return http.ListenAndServe(addr, r) } diff --git a/src/server/templates/footer.html b/src/server/templates/footer.html index 56c6ef2..c3a616e 100644 --- a/src/server/templates/footer.html +++ b/src/server/templates/footer.html @@ -1,5 +1,5 @@ {{define "footer"}} - {{end}} \ No newline at end of file + {{end}}