feat: implement reacttv-server service

Author: TimDurward

.releaserc.json

@@ -14,7 +14,7 @@
     [
       "@semantic-release/exec",
       {
-        "prepareCmd": "make build version=${nextRelease.version}",
+        "prepareCmd": "make build version=${nextRelease.version} commit=${nextRelease.gitHead}",
         "publishCmd": "make push version=${nextRelease.version} username=$CONTAINER_REGISTRY_USERNAME password=$CONTAINER_REGISTRY_PASSWORD"
       }
     ]

Makefile

@@ -11,8 +11,8 @@ version: ## Version prints out the next semantic version
 login: ## Authenticates with Docker Registry (example: make login username=$DOCKER_USER password=$DOCKER_PASSWORD)
 	@echo "Authenticating with docker registry (ghcr.io)..." ; docker login ghcr.io --username $(username) --password $(password)
 
-build: ## Builds all services with a tagged version (example: make build version=v1.0.0)
-	@cd deploy/scripts ; source docker.sh ; build $(version)
+build: ## Builds all services with a tagged version (example: make build version=v1.0.0 commit=`git rev-parse HEAD` )
+	@cd deploy/scripts ; source docker.sh ; build $(version) $(commit)
 
 push: login ## Push all services with a tagged version (example: make build version=v1.0.0 username=$DOCKER_USER password=$DOCKER_PASSWORD)
 	@cd deploy/scripts ; source docker.sh ; push $(version)

deploy/scripts/docker.sh

@@ -12,12 +12,20 @@ registry=ghcr.io/reacttv
 # Run "docker build" against the services/* dirs.
 function build() {
     version=$1
+    commit=$2
+    time=$(date +%FT%T%z)
 
     cd $reacttv_base
     for service in "${services[@]}"; do
         service_image_name=$registry/$(basename $service):$version
         echo "docker build: $service_image_name"
-        docker build -f $service/Dockerfile . -t $service_image_name --build-arg VERSION="itworks" --target prod
+        docker build \
+            -f $service/Dockerfile . \
+            -t $service_image_name \
+            --build-arg VERSION=$version \
+            --build-arg GITCOMMIT=$commit \
+            --build-arg DATE=$time \
+            --target prod
     done
 }
 

services/example/cmd/main.go

@@ -9,8 +9,7 @@ ENV CGO_ENABLED=0
 ENV GOOS=linux
 ENV GOPROXY=https://proxy.golang.org,direct
 
-ARG VERSION
-ARG ServiceDir=services/example
+ARG ServiceDir=services/server
 
 RUN mkdir -p /app
 WORKDIR /app
@@ -21,7 +20,7 @@ WORKDIR $ServiceDir
 
 RUN go mod vendor
 
-RUN IMAGE_VERSION=$VERSION && go build -mod=vendor -o /app/example ./cmd/main.go
+RUN go build -mod=vendor -o /app/server ./cmd/main.go
 
 # ---------- PRODUCTION BUILD -------------------
 
@@ -35,7 +34,10 @@ ENV GOOS=linux
 ENV GOPROXY=https://proxy.golang.org,direct
 
 ARG VERSION
-ARG ServiceDir=services/example
+ARG GITCOMMIT
+ARG DATE
+
+ARG ServiceDir=services/server
 
 RUN mkdir -p /app
 WORKDIR /app
@@ -46,13 +48,17 @@ WORKDIR $ServiceDir
 
 RUN go mod vendor
 
-RUN IMAGE_VERSION=$VERSION && go build -ldflags="-X example.Version=$IMAGE_VERSION" -o /app/example ./cmd/main.go
+RUN \
+    VERSION=$VERSION \
+    DATE=$DATE \
+    GITCOMMIT=$GITCOMMIT \
+    go build -mod=vendor -ldflags="-X 'server/pkg/version.BinVersion=${VERSION}' -X 'server/pkg/version.GitCommit=${GITCOMMIT}' -X 'server/pkg/version.BuildTime=${DATE}'" -o /app/server ./cmd/main.go
 
 FROM alpine:$ALPINE_VERSION as prod
 
-ARG ServiceDir=services/example
+ARG ServiceDir=services/server
 
 WORKDIR /app
-COPY --from=builder /app/example .
+COPY --from=builder /app/server .
 
-CMD ["/app/example"]
+CMD ["/app/server"]

services/example/go.mod

@@ -0,0 +1,16 @@
+package commands
+
+const (
+	Name = "reacttv-server"
+)
+
+type Globals struct {
+	LogLevel  string `enum:"panic,fatal,error,warn,info,debug,trace" default:"info"`
+	LogFormat string `enum:"text,json" default:"text"`
+}
+
+type DataMangementCLI struct {
+	Globals
+	Server  Server  `cmd:"" help:"Start Server with the given args"`
+	Version Version `cmd:"" help:"Current Server version"`
+}

services/example/Dockerfile renamed to services/server/Dockerfile

@@ -0,0 +1,23 @@
+package commands
+
+import (
+	log "github.com/sirupsen/logrus"
+)
+
+type Server struct {
+	DBHost     string `required help:"Postgres hostname or IP address"`
+	DBUser     string `required help:"Postgres username"`
+	DBPassword string `required help"Postgres password"`
+	DBName     string `required help"Postgres database name"`
+	Port       string `required help:"Port the server listens on"`
+}
+
+func (s *Server) Run(globals *Globals) error {
+	l := log.New()
+	lvl, err := log.ParseLevel(globals.LogLevel)
+	if err != nil {
+		l.Fatal(err)
+	}
+	l.SetLevel(lvl)
+	return nil
+}

services/server/cmd/commands/cli.go

@@ -0,0 +1,18 @@
+package commands
+
+import (
+	"server/pkg/version"
+
+	log "github.com/sirupsen/logrus"
+)
+
+type Version struct{}
+
+func (s *Version) Run(globals *Globals) error {
+	log.WithFields(log.Fields{
+		"BuildTime": version.BuildTime,
+		"Commit":    version.GitCommit,
+		"Runtime":   version.Runtime(),
+	}).Println(version.BinVersion)
+	return nil
+}

services/server/cmd/commands/server.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"server/cmd/commands"
+
+	"github.com/alecthomas/kong"
+)
+
+func main() {
+	cli := commands.DataMangementCLI{
+		Globals: commands.Globals{},
+	}
+
+	ctx := kong.Parse(&cli,
+		kong.Name(commands.Name),
+		kong.UsageOnError(),
+		kong.ConfigureHelp(kong.HelpOptions{Compact: true}))
+	err := ctx.Run(&cli.Globals)
+	ctx.FatalIfErrorf(err)
+}