Improves parrotserver Docker container

Author: kalverra

parrot/.goreleaser.yaml

@@ -2,6 +2,8 @@
 version: 2
 project_name: parrot
 
+dist: parrot/dist
+
 monorepo:
   tag_prefix: parrot/
   dir: parrot
@@ -20,8 +22,7 @@ builds:
     goarch:
       - amd64
       - arm64
-    ldflags:
-      - '-s -w'
+    binary: parrot
 
 archives:
   - formats: ['binary']
@@ -32,6 +33,7 @@ dockers:
     goarch: amd64
     image_templates:
       - '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}-amd64'
+      - '{{ .Env.IMG_PRE }}/parrot:latest-amd64'
     build_flag_templates:
       - --platform=linux/amd64
       - --pull
@@ -44,6 +46,7 @@ dockers:
     goarch: arm64
     image_templates:
       - '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}-arm64'
+      - '{{ .Env.IMG_PRE }}/parrot:latest-arm64'
     build_flag_templates:
       - --platform=linux/arm64
       - --pull
@@ -57,7 +60,11 @@ docker_manifests:
     image_templates:
       - '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}-amd64'
       - '{{ .Env.IMG_PRE }}/parrot:{{ .Tag }}-arm64'
+  - name_template: '{{ .Env.IMG_PRE }}/parrot:latest'
+    image_templates:
+      - '{{ .Env.IMG_PRE }}/parrot:latest-amd64'
+      - '{{ .Env.IMG_PRE }}/parrot:latest-arm64'
 
 before:
   hooks:
-    - sh -c "cd parrot && go mod tidy"
+    - sh -c "cd parrot && go mod tidy"

parrot/Dockerfile

@@ -1,3 +1,7 @@
 FROM scratch
+
 COPY parrot /parrot
-ENTRYPOINT [ "parrot", "-port", "9090", "-t" ]
+ENV PARROT_PORT 80
+ENV PARROT_TRACE true
+EXPOSE 80
+ENTRYPOINT [ "/parrot" ]

parrot/Makefile

@@ -36,4 +36,5 @@ fuzz:
 .PHONY: build
 build:
 	cd .. && goreleaser release --snapshot --clean -f ./parrot/.goreleaser.yaml
+	echo "Build done, check in parrot/dist for binaries"
 

parrot/cmd/main.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"os"
 	"os/signal"
+	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -26,6 +28,31 @@ func main() {
 	rootCmd := &cobra.Command{
 		Use:   "parrot",
 		Short: "A server that can register and parrot back dynamic requests",
+		PreRun: func(cmd *cobra.Command, args []string) {
+			// Check environment variables if flags are not set
+			if !cmd.Flags().Changed("port") {
+				if envPort, err := strconv.Atoi(os.Getenv("PARROT_PORT")); err == nil {
+					port = envPort
+				}
+			}
+			if !cmd.Flags().Changed("debug") {
+				debug = os.Getenv("PARROT_DEBUG") == "true"
+			}
+			if !cmd.Flags().Changed("trace") {
+				trace = os.Getenv("PARROT_TRACE") == "true"
+			}
+			if !cmd.Flags().Changed("silent") {
+				silent = os.Getenv("PARROT_SILENT") == "true"
+			}
+			if !cmd.Flags().Changed("json") {
+				json = os.Getenv("PARROT_JSON") == "true"
+			}
+			if !cmd.Flags().Changed("recorders") {
+				if envRecorders := os.Getenv("PARROT_RECORDERS"); envRecorders != "" {
+					recorders = strings.Split(envRecorders, ",")
+				}
+			}
+		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			options := []parrot.ServerOption{parrot.WithPort(port)}
 			logLevel := zerolog.InfoLevel
@@ -63,12 +90,12 @@ func main() {
 		},
 	}
 
-	rootCmd.Flags().IntVarP(&port, "port", "p", 0, "Port to run the parrot on")
-	rootCmd.Flags().BoolVarP(&debug, "debug", "d", false, "Enable debug output")
-	rootCmd.Flags().BoolVarP(&trace, "trace", "t", false, "Enable trace and debug output")
-	rootCmd.Flags().BoolVarP(&silent, "silent", "s", false, "Disable all output")
-	rootCmd.Flags().BoolVarP(&json, "json", "j", false, "Output logs in JSON format")
-	rootCmd.Flags().StringSliceVarP(&recorders, "recorders", "r", nil, "Existing recorders to use")
+	rootCmd.Flags().IntVarP(&port, "port", "p", 0, "Port to run the parrot on (env: PARROT_PORT)")
+	rootCmd.Flags().BoolVarP(&debug, "debug", "d", false, "Enable debug output (env: PARROT_DEBUG)")
+	rootCmd.Flags().BoolVarP(&trace, "trace", "t", false, "Enable trace and debug output (env: PARROT_TRACE)")
+	rootCmd.Flags().BoolVarP(&silent, "silent", "s", false, "Disable all output (env: PARROT_SILENT)")
+	rootCmd.Flags().BoolVarP(&json, "json", "j", false, "Output logs in JSON format (env: PARROT_JSON)")
+	rootCmd.Flags().StringSliceVarP(&recorders, "recorders", "r", nil, "Existing recorders to use (env: PARROT_RECORDERS)")
 
 	if err := rootCmd.Execute(); err != nil {
 		log.Error().Err(err).Msg("error executing command")

parrot/parrot.go

@@ -247,6 +247,7 @@ func (p *Server) Healthy() error {
 		ResponseStatusCode: http.StatusOK,
 	}
 
+	p.log.Info().Msg("Checking Parrot health")
 	err := p.Register(healthCheckRoute)
 	if err != nil {
 		return newDynamicError(ErrServerUnhealthy, fmt.Sprintf("%s: unable to register routes", err.Error()))
@@ -263,7 +264,7 @@ func (p *Server) Healthy() error {
 
 	p.Delete(healthCheckRoute)
 
-	p.log.Debug().Msg("Parrot is healthy")
+	p.log.Info().Msg("Parrot healthy")
 	return nil
 }