From bb8021f779ed689412d9d86d5bf12b32e0a29844 Mon Sep 17 00:00:00 2001
From: Eric Weber <github@weber.lol>
Date: Sun, 22 Sep 2024 21:13:16 +0000
Subject: [PATCH] fix: useradd docker-client gid handling

---
 README.md                           | 2 +-
 docker-client/devcontainer-bake.hcl | 4 ++--
 useradd/devcontainer-bake.hcl       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3b1faa60..c9fbf0dc 100644
--- a/README.md
+++ b/README.md
@@ -229,7 +229,7 @@ The useradd partial contains a devcontainer bake config file. See [Devcontainer
 | Variable | Required | Default | Effect |
 | --- | --- | --- | --- |
 | `USER` | &cross; | `"root"` | See [useradd Dockerfile](#useradd-dockerfile-usage) |
-| `EXTRA_GID_ARGS` | &cross; | `""` | See [useradd Dockerfile](#useradd-dockerfile-usage) |
+| `EXTRA_GID_ARGS` | &cross; | `""` or `DOCKER_CLIENT_EXTRA_GID_ARGS` if defined | See [useradd Dockerfile](#useradd-dockerfile-usage) |
 | `UID` | &cross; | `0` | Maps to `USER_UID`. See [useradd Dockerfile](#useradd-dockerfile-usage) |
 | `GID` | &cross; | `${UID}` | Maps to `USER_GID`.See [useradd Dockerfile](#useradd-dockerfile-usage) |
 
diff --git a/docker-client/devcontainer-bake.hcl b/docker-client/devcontainer-bake.hcl
index 1472c995..3bbb9a79 100644
--- a/docker-client/devcontainer-bake.hcl
+++ b/docker-client/devcontainer-bake.hcl
@@ -1,8 +1,8 @@
 variable "DOCKER_GID" {
   default = "800"
 }
-// Set EXTRA_GID_ARGS to include a Docker group in case the useradd partial will be included
-variable "EXTRA_GID_ARGS" {
+// Define an extra GID arg with the Docker group ID in case the useradd partial will be included
+variable "DOCKER_CLIENT_EXTRA_GID_ARGS" {
   default = "--gid ${DOCKER_GID}"
 }
 
diff --git a/useradd/devcontainer-bake.hcl b/useradd/devcontainer-bake.hcl
index 3b67b00d..da0a63b2 100644
--- a/useradd/devcontainer-bake.hcl
+++ b/useradd/devcontainer-bake.hcl
@@ -1,5 +1,5 @@
 variable "EXTRA_GID_ARGS" {
-  default = ""
+  default = try(DOCKER_CLIENT_EXTRA_GID_ARGS, "")
 }
 variable "USER" {
   default = "root"