Merge pull request #3 from eexit/add-hc

Add Docker image healthcheck

.env.dist

@@ -1,5 +1,3 @@
-SERVER_HOST=
-SERVER_PORT=8080
 SERVER_SHUTDOWN_TIMEOUT=5
 TRACEPARENT_HEADER=traceparent
 SMTP_ADDR=smtp:1025

Dockerfile

@@ -1,3 +1,5 @@
+FROM eexit/curl-healthchecker:v1.0.0 AS curl
+
 FROM golang:1 AS builder
 RUN update-ca-certificates
 ARG version
@@ -13,7 +15,10 @@ RUN CGO_ENABLED=0 GOOS=${goos} GOARCH=${goarch} go build \
     ./cmd/http2smtp
 
 FROM scratch
+COPY --from=curl /curl /
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /http2smtp /
-EXPOSE 8080
+EXPOSE 80
+HEALTHCHECK --interval=5s --timeout=1s --retries=3 \
+    CMD ["/curl", "-fIA", "cURL healthcheck", "http://127.0.0.1/healthcheck"]
 CMD ["/http2smtp"]

docker-compose.yml

@@ -7,7 +7,7 @@ services:
         version: v0.1.0+dev
     env_file: .env
     ports:
-      - 8080:8080
+      - 8080:80
     depends_on:
       smtp:
         condition: service_started

internal/api/server.go

@@ -77,7 +77,7 @@ func New(
 
 	svr.svr = &serverWrapper{
 		&http.Server{
-			Addr:         e.ServerHost + ":" + e.ServerPort,
+			Addr:         ":80",
 			Handler:      svr.Wrap(svr.Mux()),
 			ReadTimeout:  30 * time.Second,
 			WriteTimeout: 30 * time.Second,
@@ -96,7 +96,7 @@ func (a *API) Serve() error {
 	errch := make(chan error)
 
 	go func(errch chan error) {
-		a.logger.Info().Msgf("listening on %s:%s", a.env.ServerHost, a.env.ServerPort)
+		a.logger.Info().Msg("listening on :80")
 		if err := a.svr.ListenAndServe(); err != http.ErrServerClosed {
 			// Error starting the listener:
 			a.logger.Err(err).Msgf("server listening error: %s", err)

internal/api/server_test.go

@@ -21,22 +21,22 @@ import (
 func TestNew(t *testing.T) {
 	got := New(
 		env.Bag{
-			ServerHost: "test",
-			ServerPort: "8080",
+			SMTPAddr: "smtp:25",
+			LogLevel: "info",
 		},
 		zerolog.New(ioutil.Discard),
 		&smtp.Stub{},
 		converter.NewProvider(),
 	)
 	want := &API{
 		env: env.Bag{
-			ServerHost: "test",
-			ServerPort: "8080",
+			SMTPAddr: "smtp:25",
+			LogLevel: "info",
 		},
 		logger:            zerolog.New(ioutil.Discard),
 		smtpClient:        &smtp.Stub{},
 		converterProvider: converter.NewProvider(),
-		svr:               &serverWrapper{&http.Server{Addr: "test:8080"}},
+		svr:               &serverWrapper{&http.Server{Addr: ":80"}},
 	}
 
 	if !reflect.DeepEqual(got.logger, want.logger) {

internal/converter/converter_test.go

@@ -139,7 +139,7 @@ func Test_provider_Get(t *testing.T) {
 		},
 		{
 			name:       "requested converter exist when there are several converters",
-			converters: []Converter{&rfc5322{}, &Stub{}},
+			converters: []Converter{&Stub{}, &rfc5322{}},
 			cid:        StubConverterID,
 			want:       &Stub{},
 			wantErr:    false,

internal/env/env.go

@@ -2,10 +2,6 @@ package env
 
 // Bag holds all the config envvars
 type Bag struct {
-	// ServerHost is the app hostname to listen for incoming HTTP requests from
-	ServerHost string `envconfig:"SERVER_HOST"`
-	// ServerPort is the app listening port
-	ServerPort string `envconfig:"SERVER_PORT" default:"8080"`
 	// ServerShutdownTimeout is a duration in seconds to graceful shutdown internal
 	// processes when the app has initiated a shutdown.
 	ServerShutdownTimeout int `envconfig:"SERVER_SHUTDOWN_TIMEOUT" default:"5"`