From 1d50cefd9ee576572fc34cccfe17cc78de4dadb6 Mon Sep 17 00:00:00 2001
From: egibs <20933572+egibs@users.noreply.github.com>
Date: Fri, 7 Feb 2025 15:02:17 -0600
Subject: [PATCH] Set user GID after user and group are created

Signed-off-by: egibs <20933572+egibs@users.noreply.github.com>
---
 pkg/config/config.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkg/config/config.go b/pkg/config/config.go
index 7d4ef60ad..143f97fe1 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -1360,12 +1360,19 @@ func ParseConfiguration(_ context.Context, configurationFilePath string, opts ..
 	cfg.Data = nil // TODO: zero this out or not?
 
 	// TODO: validate that subpackage ranges have been consumed and applied
+	usr := apko_types.User{
+		UserName: "build",
+		UID:      1000,
+	}
 
 	grp := apko_types.Group{
 		GroupName: "build",
 		GID:       1000,
-		Members:   []string{"build"},
+		Members:   []string{usr.UserName},
 	}
+
+	usr.GID = apko_types.GID(&grp.GID)
+
 	cfg.Environment.Accounts.Groups = append(cfg.Environment.Accounts.Groups, grp)
 	if cfg.Test != nil {
 		cfg.Test.Environment.Accounts.Groups = append(cfg.Test.Environment.Accounts.Groups, grp)
@@ -1377,12 +1384,6 @@ func ParseConfiguration(_ context.Context, configurationFilePath string, opts ..
 		sub.Test.Environment.Accounts.Groups = append(sub.Test.Environment.Accounts.Groups, grp)
 	}
 
-	gid1000 := uint32(1000)
-	usr := apko_types.User{
-		UserName: "build",
-		UID:      1000,
-		GID:      apko_types.GID(&gid1000),
-	}
 	cfg.Environment.Accounts.Users = append(cfg.Environment.Accounts.Users, usr)
 	if cfg.Test != nil {
 		cfg.Test.Environment.Accounts.Users = append(cfg.Test.Environment.Accounts.Users, usr)