From f61faa4b2dfd552541b7ace5f5e33925049c315d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20SZKIBA?= <szkiba@users.noreply.github.com>
Date: Tue, 10 Sep 2024 10:16:41 +0200
Subject: [PATCH] fix: use correct uid/gid to avoid cache saving propems in GH
 action mode

---
 Dockerfile.goreleaser |  6 ++++--
 cmd/cmd.go            | 27 ---------------------------
 releases/v0.1.23.md   |  9 +++++++++
 3 files changed, 13 insertions(+), 29 deletions(-)
 create mode 100644 releases/v0.1.23.md

diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser
index 334dbdb..a030294 100644
--- a/Dockerfile.goreleaser
+++ b/Dockerfile.goreleaser
@@ -1,8 +1,10 @@
 FROM debian:12.6-slim
 
-RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates
-RUN update-ca-certificates
+RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && update-ca-certificates && \
+    addgroup --system --gid 127 docker && adduser --uid 1001 --gid 127 --disabled-password runner
 
 COPY k6registry /usr/bin/
 
+USER runner
+
 ENTRYPOINT ["k6registry"]
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 831851e..f06af54 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -8,9 +8,7 @@ import (
 	"io/fs"
 	"log/slog"
 	"os"
-	"path/filepath"
 
-	"github.com/adrg/xdg"
 	"github.com/grafana/k6registry"
 	"github.com/spf13/cobra"
 )
@@ -55,9 +53,6 @@ func New(levelVar *slog.LevelVar) (*cobra.Command, error) {
 
 			return run(cmd.Context(), args, opts)
 		},
-		PostRunE: func(_ *cobra.Command, _ []string) error {
-			return ghActionFixPerm(xdg.CacheHome)
-		},
 	}
 
 	ctx, err := newContext(context.TODO(), root.Root().Name())
@@ -171,28 +166,6 @@ func run(ctx context.Context, args []string, opts *options) (result error) {
 	return nil
 }
 
-func ghActionFixPerm(dir string) error {
-	if os.Getenv("GITHUB_ACTIONS") != "true" { //nolint:forbidigo
-		return nil
-	}
-
-	return filepath.Walk(dir, func(path string, info fs.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		var mode fs.FileMode
-
-		if info.IsDir() {
-			mode = permDir
-		} else {
-			mode = permFile
-		}
-
-		return os.Chmod(path, mode) //nolint:forbidigo
-	})
-}
-
 const (
 	permFile fs.FileMode = 0o644
 	permDir  fs.FileMode = 0o755
diff --git a/releases/v0.1.23.md b/releases/v0.1.23.md
new file mode 100644
index 0000000..a6d52b3
--- /dev/null
+++ b/releases/v0.1.23.md
@@ -0,0 +1,9 @@
+k6registry `v0.1.23` is here 🎉!
+
+This is an internal maintenance release.
+
+**Fix cache saving issue**
+
+The GitHub workflow is running with user id `1001` and group id `127`. The k6registry docker container runs with the default user id in debian.  As a consequence, the cache directory created under XDG_CACHE_HOME fails to save.
+
+The solution is to use the same user id and group id as the GitHub workflow in the k6registry docker container (user id: `1001`, group id: `127`).