Merge pull request #523 from ElsevierAlex/ENTELLECT-26971-docker-GID-fix

myoung34 · web-flow · commit 73c1f986a00b · 2025-11-24T11:04:55.000-06:00
Set fixed Docker GID to avoid collisions with some groups
diff --git a/build/config.json b/build/config.json
@@ -1,7 +1,8 @@
 {
   "user": {
     "user-id": 1001,
-    "group-id": 121
+    "group-id": 121,
+    "docker-group-id": 500
   },
   "install": [
     {
diff --git a/build/config.sh b/build/config.sh
@@ -13,6 +13,10 @@ function group_id() {
   jq -r '.user."group-id"' "$(config_file)"
 }
 
+function docker_group_id() {
+  jq -r '.user."docker-group-id"' "$(config_file)"
+}
+
 function apt_packages() {
   jq -r '.install[] | select(.source == "apt") | .packages[]' "$(config_file)" | paste -sd ' ' -
 }
diff --git a/build/install_base.sh b/build/install_base.sh
@@ -50,6 +50,8 @@ install_essentials
 configure_sources
 
 apt-get update
+# The docker group needs to run before installers
+groupadd -g "$(docker_group_id)" docker || :
 install_tools_apt
 install_tools
 
diff --git a/goss_base.yaml b/goss_base.yaml
@@ -87,3 +87,6 @@ group:
     runner:
         exists: true
         gid: 121
+    docker:
+        exists: true
+        gid: 500

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,10 @@ function group_id() {`
`13`	`13`	`jq -r '.user."group-id"' "$(config_file)"`
`14`	`14`	`}`
`15`	`15`
	`16`	`+function docker_group_id() {`
	`17`	`+ jq -r '.user."docker-group-id"' "$(config_file)"`
	`18`	`+}`
	`19`	`+`
`16`	`20`	`function apt_packages() {`
`17`	`21`	`jq -r '.install[] \| select(.source == "apt") \| .packages[]' "$(config_file)" \| paste -sd ' ' -`
`18`	`22`	`}`