Refactor

.dockerignore

@@ -6,4 +6,4 @@ Dockerfile
 LICENSE
 Makefile
 README.md
-web
+test

Dockerfile

@@ -1,11 +1,11 @@
 FROM golang:1-alpine AS build
-ENV GO111MODULE=on \
-    CGO_ENABLED=0 \
-    GOOS=linux \
-    GOARCH=amd64
+ENV CGO_ENABLED=0 \
+    GO111MODULE=on \
+    GOARCH=amd64 \
+    GOOS=linux
 WORKDIR /
 COPY . ./
-RUN go build -o gss -ldflags="-s -w" src/main.go
+RUN go build -o gss -ldflags="-s -w" gss.go
 
 FROM scratch
 COPY --from=build /gss ./

Makefile

@@ -1,11 +1,11 @@
 build:
 	@docker build -t lewislbr/gss:test .
 
-run-cli:
-	@docker run -p 8080:7891 -v $$PWD/web/dist:/public lewislbr/gss:test -d public -p 7891
+run-cli: build
+	@docker run --rm -p 8080:8081 -v $$PWD/test/web/dist:/public lewislbr/gss:test -d public -p 8081
 
-run-default:
-	@docker run -p 8080:80 -v $$PWD/web/dist:/dist lewislbr/gss:test
+run-default: build
+	@docker run --rm -p 8080:80 -v $$PWD/test/web/dist:/dist lewislbr/gss:test
 
-run-yaml:
-	@docker run -p 8080:7892 -v $$PWD/gss.yaml:/gss.yaml -v $$PWD/web/dist:/public lewislbr/gss:test
+run-yaml: build
+	@docker run --rm -p 8080:8081 -v $$PWD/test/gss.yaml:/gss.yaml -v $$PWD/test/web/dist:/public lewislbr/gss:test

README.md

@@ -36,11 +36,11 @@ docker run -p [container-port]:[server-port] -v [yaml-file]:/gss.yaml -v [spa-fo
 >
 > ```yaml
 > directory: public
-> port: 7892
+> port: 8080
 > ```
 >
 > ```sh
-> docker run -p 8080:7892 -v $PWD/gss.yaml:/gss.yaml -v $PWD/web/dist:/public lewislbr/gss:test
+> docker run -p 8080:8080 -v $PWD/gss.yaml:/gss.yaml -v $PWD/web/dist:/public lewislbr/gss:test
 > ```
 
 With CLI:
@@ -52,7 +52,7 @@ docker run -p [container-port]:[server-port] -v [spa-folder]:/[container-folder]
 > Example:
 >
 > ```sh
-> docker run -p 8080:7891 -v $PWD/public:/dist lewislbr/gss -d public -p 7891
+> docker run -p 8080:8080 -v $PWD/public:/dist lewislbr/gss -d public -p 8080
 > ```
 
 If both a YAML config and a CLI flag set up a configuration option, the CLI flag prevails.
@@ -106,13 +106,13 @@ Default: `80`.
 > YAML:
 >
 > ```yaml
-> port: 7892
+> port: 8080
 > ```
 >
 > CLI:
 >
 > ```sh
-> docker run -p 8080:7892 -v $PWD/public:/dist lewislbr/gss -p 7892
+> docker run -p 8080:8080 -v $PWD/public:/dist lewislbr/gss -p 8080
 > ```
 
 ## Contributing

src/main.go → gss.go

@@ -43,21 +43,7 @@ func main() {
 	}
 }
 
-// startServer initializes the server.
-func startServer() error {
-	httpServer := customHTTPServer(port, addHeaders(serveSPA(dir)))
-
-	log.Printf("GSS info: serving directory %q on port %v ✅\n", dir, port)
-
-	err := httpServer.ListenAndServe()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// setUpYAML enables configuration via YAML file.
+// Enable configuration via YAML file.
 func setUpYAML() error {
 	configFile := "gss.yaml"
 
@@ -99,7 +85,7 @@ func setUpYAML() error {
 	return nil
 }
 
-// setUpCLI enables configuration via CLI flags.
+// Enable configuration via CLI flags.
 func setUpCLI() {
 	d := flag.String("d", dir, "Path to the directory to serve.")
 	p := flag.String("p", port, "Port where to run the server.")
@@ -120,18 +106,27 @@ func setUpCLI() {
 	}
 }
 
-// customHTTPServer configures a basic HTTP server
-func customHTTPServer(port string, h http.Handler) *http.Server {
+// Initialize the server.
+func startServer() error {
+	s := setUpServer(port)
+
+	log.Printf("GSS info: serving directory %q on port %v ✅\n", dir, port)
+
+	return s.ListenAndServe()
+}
+
+// Configure a basic HTTP server.
+func setUpServer(port string) *http.Server {
 	return &http.Server{
 		Addr:         ":" + port,
-		Handler:      h,
+		Handler:      addHeaders(serveSPA(dir)),
 		IdleTimeout:  120 * time.Second,
 		ReadTimeout:  5 * time.Second,
 		WriteTimeout: 10 * time.Second,
 	}
 }
 
-// serveSPA serves files from a directory, defaulting to the index if the root
+// Serve files from a directory, defaulting to the index if the root
 // is requested or a file is not found, leaving it for the SPA to handle. If
 // the directory contains pre-compressed brotli or gzip files those are served
 // instead for the file types that accept them.
@@ -191,7 +186,7 @@ func serveSPA(dir string) http.HandlerFunc {
 	}
 }
 
-// addHeaders adds custom headers to the response
+// Add custom headers to the response.
 func addHeaders(h http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Add("Server", "GSS")

gss.yaml → test/gss.yaml

@@ -2,4 +2,4 @@ directory: public
 headers:
   Referrer-Policy: "strict-origin-when-cross-origin"
   Strict-Transport-Security: "max-age=63072000; includeSubDomains; preload"
-port: 7892
+port: 8081