feat: adding repo server docker file

Author: mxcd

.github/workflows/build.yml

@@ -25,10 +25,10 @@ jobs:
             artifact_suffix: ""
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.19
+          go-version: 1.24
       - name: golang build
         env:
           GOARCH: ${{ matrix.arch }}

.github/workflows/golang-tests.yml

@@ -19,6 +19,8 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: 1.19
+      - name: start soft-serve
+        run: ./hack/soft-serve/start.sh
       - name: run golang tests
         env:
           SOPS_AGE_KEY_FILE: ${{ github.workspace }}/test_assets/keys.txt

.gitignore

@@ -21,6 +21,7 @@ main
 gitops
 # Actually... dont ignore gitops directory
 !cmd/gitops/
+!docker/gitops/
 
 # Created by https://www.toptal.com/developers/gitignore/api/go,visualstudiocode,goland+all
 # Edit at https://www.toptal.com/developers/gitignore?templates=go,visualstudiocode,goland+all

cmd/gitops/main.go

@@ -259,6 +259,12 @@ func main() {
 						Usage:   "SSH key passphrase for authenticating against the GitOps repository",
 						EnvVars: []string{"GITOPS_REPOSITORY_SSH_KEY_PASSPHRASE"},
 					},
+					&cli.StringFlag{
+						Name:    "actor",
+						Value:   "",
+						Usage:   "Username of the actor to be used for the commit",
+						EnvVars: []string{"GITOPS_ACTOR"},
+					},
 				},
 				Action: func(c *cli.Context) error {
 					initApplication(c)

cmd/repo-server/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"os"
+	"time"
 
 	"github.com/rs/zerolog/log"
 
@@ -27,11 +28,14 @@ func main() {
 	if err != nil {
 		log.Panic().Err(err).Msg("error initializing git connection")
 	}
+	log.Info().Msg("Cloning git repository")
+	startTime := time.Now()
 
 	err = gitConnection.Clone()
 	if err != nil {
 		log.Panic().Err(err).Msg("error cloning git repository")
 	}
+	log.Info().Msgf("Cloned git repository in %s", time.Since(startTime))
 
 	gitPatcher, err := patch.NewGitPatcher(&patch.GitPatcherOptions{
 		GitConnection: gitConnection,
@@ -59,6 +63,7 @@ func main() {
 	server.RegisterMiddlewares()
 	server.RegisterRoutes()
 
+	log.Info().Msgf("Starting server on port %d", config.Get().Int("PORT"))
 	err = server.Run()
 	if err != nil {
 		log.Panic().Err(err).Msg("error running server")

Dockerfile docker/gitops/DockerfileDockerfile renamed to docker/gitops/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine3.17 AS builder
+FROM golang:1.24-alpine3.20 AS builder
 RUN apk add --no-cache git
 
 WORKDIR /usr/src
@@ -12,7 +12,7 @@ COPY internal internal
 WORKDIR /usr/src/cmd/gitops
 RUN go build -o gitops -ldflags="-s -w" .
 
-FROM alpine:3.17
+FROM alpine:3.20
 WORKDIR /usr/bin
 COPY --from=builder /usr/src/cmd/gitops/gitops .
 ENTRYPOINT ["/usr/bin/gitops"]

docker/repo-server/Dockerfile

@@ -0,0 +1,43 @@
+FROM golang:1.24-alpine AS builder
+
+RUN apk add --no-cache \
+  build-base \
+  cmake \
+  openssl-dev \
+  libssh2-dev \
+  zlib-dev \
+  curl \
+  git
+
+WORKDIR /tmp
+RUN curl -L https://github.com/libgit2/libgit2/archive/refs/tags/v1.5.0.tar.gz | tar xz && \
+    cd libgit2-1.5.0 && \
+    cmake . -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=/usr && \
+    cmake --build . --target install
+
+WORKDIR /go/src/github.com/libgit2
+RUN git clone https://github.com/libgit2/git2go.git && \
+    cd git2go && \
+    git checkout v34.0.0 && \
+    git submodule update --init
+
+ENV CGO_CFLAGS="-I/usr/include"
+ENV CGO_LDFLAGS="-L/usr/lib -lz -lssl -lcrypto"
+ENV LD_LIBRARY_PATH="/usr/lib"
+
+WORKDIR /usr/src
+COPY go.mod /usr/src/go.mod
+COPY go.sum /usr/src/go.sum
+RUN go mod download
+
+COPY cmd cmd
+COPY internal internal
+
+WORKDIR /usr/src/cmd/repo-server
+RUN go build -o repo-server -ldflags="-s -w" .
+
+FROM alpine:3.21
+WORKDIR /usr/bin
+COPY --from=builder /usr/src/cmd/repo-server/repo-server .
+ENTRYPOINT ["/usr/bin/repo-server"]
+EXPOSE 8080

internal/git/git.go

@@ -67,7 +67,7 @@ func NewGitConnection(options *ConnectionOptions) (*Connection, error) {
 
 	if options.Signature == nil {
 		connection.Options.Signature = &Signature{
-			Name:  "GitOps CI User",
+			Name:  "GitOps CLI CI User",
 			Email: "gitops@example.com",
 		}
 	} else {