Change the gid to 1001 (#51)

The jammy stack has no default user or group configured, but with Noble there is a default user and group. These are assigned to uid and gid 1000. The uid was previously changed to 1001 (build) and 1002 (run), but the gid was not changed. This changes the gid to 1001 (from 1000), so that it does not collide with the default gid that is in the image

Signed-off-by: Daniel Mikusa <dan@mikusa.com>

Author: dmikusa

metadata_base_stack_test.go

@@ -87,16 +87,16 @@ func testMetadataBaseStack(t *testing.T, context spec.G, it spec.S) {
 			Expect(buildReleaseDate).NotTo(BeZero())
 
 			Expect(image).To(SatisfyAll(
-				HaveFileWithContent("/etc/group", ContainSubstring("cnb:x:1000:")),
-				HaveFileWithContent("/etc/passwd", ContainSubstring("cnb:x:1001:1000::/home/cnb:/bin/bash")),
+				HaveFileWithContent("/etc/group", ContainSubstring("cnb:x:1001:")),
+				HaveFileWithContent("/etc/passwd", ContainSubstring("cnb:x:1001:1001::/home/cnb:/bin/bash")),
 				HaveDirectory("/home/cnb"),
 			))
 
-			Expect(file.Config.User).To(Equal("1001:1000"))
+			Expect(file.Config.User).To(Equal("1001:1001"))
 
 			Expect(file.Config.Env).To(ContainElements(
 				"CNB_USER_ID=1001",
-				"CNB_GROUP_ID=1000",
+				"CNB_GROUP_ID=1001",
 				"CNB_STACK_ID=io.buildpacks.stacks.noble",
 			))
 
@@ -177,11 +177,11 @@ func testMetadataBaseStack(t *testing.T, context spec.G, it spec.S) {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(runReleaseDate).NotTo(BeZero())
 
-			Expect(file.Config.User).To(Equal("1002:1000"))
+			Expect(file.Config.User).To(Equal("1002:1001"))
 
 			Expect(image).To(SatisfyAll(
-				HaveFileWithContent("/etc/group", ContainSubstring("cnb:x:1000:")),
-				HaveFileWithContent("/etc/passwd", ContainSubstring("cnb:x:1002:1000::/home/cnb:/bin/bash")),
+				HaveFileWithContent("/etc/group", ContainSubstring("cnb:x:1001:")),
+				HaveFileWithContent("/etc/passwd", ContainSubstring("cnb:x:1002:1001::/home/cnb:/bin/bash")),
 				HaveDirectory("/home/cnb"),
 			))
 

metadata_static_stack_test.go

@@ -93,11 +93,11 @@ func testMetadataStaticStack(t *testing.T, context spec.G, it spec.S) {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(runReleaseDate).NotTo(BeZero())
 
-			Expect(file.Config.User).To(Equal("1002:1000"))
+			Expect(file.Config.User).To(Equal("1002:1001"))
 
 			Expect(image).To(SatisfyAll(
-				HaveFileWithContent("/etc/group", ContainSubstring("cnb:x:1000:")),
-				HaveFileWithContent("/etc/passwd", ContainSubstring("cnb:x:1002:1000::/home/cnb:/sbin/nologin")),
+				HaveFileWithContent("/etc/group", ContainSubstring("cnb:x:1001:")),
+				HaveFileWithContent("/etc/passwd", ContainSubstring("cnb:x:1002:1001::/home/cnb:/sbin/nologin")),
 				HaveDirectory("/home/cnb"),
 			))
 

metadata_tiny_stack_test.go

@@ -93,11 +93,11 @@ func testMetadataTinyStack(t *testing.T, context spec.G, it spec.S) {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(runReleaseDate).NotTo(BeZero())
 
-			Expect(file.Config.User).To(Equal("1002:1000"))
+			Expect(file.Config.User).To(Equal("1002:1001"))
 
 			Expect(image).To(SatisfyAll(
-				HaveFileWithContent("/etc/group", ContainSubstring("cnb:x:1000:")),
-				HaveFileWithContent("/etc/passwd", ContainSubstring("cnb:x:1002:1000::/home/cnb:/sbin/nologin")),
+				HaveFileWithContent("/etc/group", ContainSubstring("cnb:x:1001:")),
+				HaveFileWithContent("/etc/passwd", ContainSubstring("cnb:x:1002:1001::/home/cnb:/sbin/nologin")),
 				HaveDirectory("/home/cnb"),
 			))
 

stacks/noble-base-stack/stack.toml

@@ -7,7 +7,7 @@ platforms = ["linux/amd64", "linux/arm64"]
 [build]
   description = "ubuntu:noble with compilers and shell utilities"
   dockerfile = "./build.Dockerfile"
-  gid = 1000
+  gid = 1001
   shell = "/bin/bash"
   uid = 1001
 
@@ -60,7 +60,7 @@ Components: main universe multiverse
 [run]
   description = "ubuntu:noble with some common dependencies like tzdata and openssl"
   dockerfile = "./run.Dockerfile"
-  gid = 1000
+  gid = 1001
   shell = "/bin/bash"
   uid = 1002
 

stacks/noble-static-stack/stack.toml

@@ -7,7 +7,7 @@ platforms = ["linux/amd64", "linux/arm64"]
 [build]
   description = "ubuntu:noble with compilers and shell utilities"
   dockerfile = "./build.Dockerfile"
-  gid = 1000
+  gid = 1001
   shell = "/bin/bash"
   uid = 1001
 
@@ -58,7 +58,7 @@ Components: main universe multiverse
 [run]
   description = "noble for statically-linked applications containing tzdata and ca-certificates"
   dockerfile = "./run/run.Dockerfile"
-  gid = 1000
+  gid = 1001
   shell = "/sbin/nologin"
   uid = 1002
 

stacks/noble-tiny-stack/stack.toml

@@ -7,7 +7,7 @@ platforms = ["linux/amd64", "linux/arm64"]
 [build]
   description = "ubuntu:noble with compilers and shell utilities"
   dockerfile = "./build.Dockerfile"
-  gid = 1000
+  gid = 1001
   shell = "/bin/bash"
   uid = 1001
 
@@ -58,7 +58,7 @@ Components: main universe multiverse
 [run]
   description = "distroless-like noble"
   dockerfile = "./run/run.Dockerfile"
-  gid = 1000
+  gid = 1001
   shell = "/sbin/nologin"
   uid = 1002