feat: add cli arguments to select port

Author: drawbu

flake.nix

@@ -85,7 +85,7 @@
                 ./static
               ];
             };
-            vendorHash = "sha256-nw5TouuxauSa520hidHom/iN6VxrGN/7By9spsJ5h6Y=";
+            vendorHash = "sha256-ODDE+a414UoPVfa9HCSZlYf/YdCRq0sH5FQoUk4jqEM=";
             tags = [ "production" ];
             nativeBuildInputs = with pkgs; [
               templ
@@ -133,7 +133,7 @@
                   name = "healthcheck";
                   runtimeInputs = [ pkgs.curl ];
                   text = ''
-                    test "$(curl --fail localhost:8080/health)" = "OK"
+                    test "$(curl --fail localhost/health)" = "OK"
                   '';
                 };
               in
@@ -142,7 +142,11 @@
                   "CMD"
                   "${lib.getExe healthcheck}"
                 ];
-                Entrypoint = [ "app" ];
+                Entrypoint = [
+                  "app"
+                  "--port"
+                  "80"
+                ];
               };
           };
 

go.mod

@@ -8,12 +8,15 @@ require (
 	github.com/a-h/templ v0.3.833
 	github.com/alecthomas/chroma/v2 v2.15.0
 	github.com/charmbracelet/log v0.4.0
+	github.com/pschou/go-params v0.0.0-20240104134853-225c817afb69
 	github.com/yuin/goldmark v1.7.8
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 	github.com/yuin/goldmark-meta v1.1.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
+require github.com/xhit/go-str2duration v1.2.0 // indirect
+
 require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/charmbracelet/lipgloss v1.0.0 // indirect

go.sum

@@ -45,6 +45,8 @@ github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pschou/go-params v0.0.0-20240104134853-225c817afb69 h1:IG1MpLiUP9a+mRCJd70MTHtbWWDNU+xKl2BDvcIlS/Q=
+github.com/pschou/go-params v0.0.0-20240104134853-225c817afb69/go.mod h1:kqNkpjmn8DxDO8Tt7NxX3u5gGUtf+41EXepNOsMlJGE=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -54,6 +56,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/xhit/go-str2duration v1.2.0 h1:BcV5u025cITWxEQKGWr1URRzrcXtu7uk8+luz3Yuhwc=
+github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4=
 github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
 github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=

main.go

@@ -7,17 +7,30 @@ import (
 	"app/pkg/routes/health"
 	"app/pkg/routes/resume"
 	"app/pkg/routes/root"
+	"fmt"
+	"os"
 
 	"github.com/charmbracelet/log"
+	"github.com/pschou/go-params"
 )
 
 var (
-	rev string = "foo"
+	rev         string = "foo"
+	defaultPort int    = 8080
 )
 
 func main() {
-	log.Info("Current revision: " + rev)
-	serv := app.Server{Port: 8080, Rev: rev}
+	params.Usage = func() {
+		fmt.Fprintf(os.Stderr, "drawbu.dev, build rev: %s\n\n"+
+			"Usage: %s [options...]\n\n", rev, os.Args[0])
+		params.PrintDefaults()
+	}
+	var port = params.Int("port", defaultPort, "Web server's listening port", "Number")
+	params.Parse()
+
+	log.Info("Starting server", "port", *port, "rev", rev)
+
+	serv := app.Server{Port: int16(*port), Rev: rev}
 
 	serv.AddRoute("GET /", root.Handler)
 	serv.AddRoute("GET /health", health.Handler)

pkg/routes/blog/article.go

@@ -96,7 +96,7 @@ func fileToMarkdown(file fs.File, buf *bytes.Buffer) (mdParser.Context, error) {
 	if err != nil {
 		return nil, fmt.Errorf("Error getting file info: %s", err)
 	}
-	log.Info("Opening new article", "name", info.Name)
+	log.Info("Opening new article", "name", info.Name())
 
 	content := make([]byte, info.Size())
 	if _, err = file.Read(content); err != nil {