add docker bake

Author: sampsonj

Dockerfile

@@ -41,13 +41,6 @@ RUN go mod verify \
 
 FROM alpine:3.20
 
-# Traefik auto discover labels
-LABEL \
-  traefik.http.services.portal-public-api-docs.loadbalancer.server.port="3020" \
-  traefik.http.services.portal-public-api-docs.loadbalancer.healthcheck.path="/health" \
-  traefik.http.services.portal-public-api-docs.loadbalancer.healthcheck.interval="10s" \
-  traefik.http.services.portal-public-api-docs.loadbalancer.healthcheck.timeout="5s"
-
 EXPOSE 3020
 
 # Copy build artifacts from builder container
@@ -58,11 +51,10 @@ COPY --from=go-builder /go/src/app .
 ENV PORTAL_CLIENT_ROUTE="/"
 ENV PORTAL_PORT=3020
 
-RUN addgroup -S go \
-  && adduser -S -G go go \
-  && chown -R go:go /go/src/app
+RUN addgroup --gid 1301 docs \
+  && adduser -u 444 -D -G docs docs \
+  && chown -R docs:docs /go/src/app
 
-# Run as the go user
-USER go
+USER docs
 
 CMD ["./server"]

docker-bake.hcl

@@ -0,0 +1,26 @@
+# Populated from GitHub Action
+variable "REPO" {
+  default = ""
+}
+
+group "default" {
+  targets = [
+    "portal-public-api-docs",
+  ]
+}
+
+# Populated from GitHub Action
+target "docker-metadata-action" {
+  tags = []
+}
+
+target "bootstrap" {
+  platforms = [ "linux/amd64" ]
+  no-cache = true
+}
+
+target "portal-public-api-docs" {
+  inherits = ["bootstrap", "docker-metadata-action"]
+  tags = [for tag in target.docker-metadata-action.tags : tag]
+  dockerfile = "Dockerfile"
+}

scripts/docker.build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-REPO_NAME=quay.io/battelleecology/
+REPO_NAME=""
 IMAGE_NAME=portal-public-api-docs
 
 if [ -n "$1" ]; then

server/server.go

@@ -24,14 +24,20 @@ var (
 	clientRoute   string = os.Getenv("PORTAL_CLIENT_ROUTE")
 	port          string = os.Getenv("PORTAL_PORT")
 	routeRegex           = regexp.MustCompile(fmt.Sprintf(`^%s(.*)`, clientRoute))
+	healthPath    string = "/health"
+)
+
+var (
+	infoLog  = log.New(os.Stdout, "", log.LstdFlags)
+	errorLog = log.New(os.Stderr, "", log.LstdFlags)
 )
 
 var healthResponse healthCheckResponse = healthCheckResponse{
 	Status: "UP",
 }
 
 func handleHealthCheck(w http.ResponseWriter) {
-	log.Println("INFO: Health check up")
+	infoLog.Println("INFO: Health check up")
 	w.Header().Add("Content-Type", "application/json")
 	if err := json.NewEncoder(w).Encode(healthResponse); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
@@ -60,7 +66,7 @@ func (fs sanitizedFileSystem) Open(name string) (http.File, error) {
 	if err != nil {
 		return nil, err
 	}
-	s, err := f.Stat()
+	s, _ := f.Stat()
 	if s.IsDir() {
 		index := fmt.Sprintf("%s/%s", strings.TrimSuffix(name, "/"), indexFilename)
 		ff, err := fs.fs.Open(index)
@@ -77,7 +83,7 @@ func getRootHandlerFunc() http.HandlerFunc {
 	handleFileServer := http.StripPrefix(clientRoute, fs)
 	return func(w http.ResponseWriter, r *http.Request) {
 		switch {
-		case "/health" == r.URL.Path:
+		case healthPath == r.URL.Path:
 			handleHealthCheck(w)
 		case routeRegex.MatchString(r.URL.Path):
 			handleFileServer.ServeHTTP(w, r)
@@ -88,12 +94,12 @@ func getRootHandlerFunc() http.HandlerFunc {
 }
 
 func main() {
-	log.Println("INFO: Starting go static file server...")
+	infoLog.Println("INFO: Starting go static file server...")
 	runtime.GOMAXPROCS(runtime.NumCPU())
 	http.HandleFunc("/", getRootHandlerFunc())
-	log.Println(fmt.Sprintf("INFO: Listening on port %s", port))
-	log.Println(fmt.Sprintf("INFO: Serving files from directory %s", fileDir))
+	infoLog.Printf("INFO: Listening on port %s", port)
+	infoLog.Printf("INFO: Serving files from directory %s", fileDir)
 	if err := http.ListenAndServe(fmt.Sprintf(":%s", port), nil); err != nil {
-		log.Fatalf("Error in ListenAndServe: %s", err)
+		errorLog.Fatalf("Error in ListenAndServe: %s", err)
 	}
 }