Skip to content

Commit ddaa37c

Browse files
committed
Set fixed Docker GID to avoid collisions with some groups
1 parent e20053e commit ddaa37c

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

build/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"user": {
33
"user-id": 1001,
4-
"group-id": 121
4+
"group-id": 121,
5+
"docker-group-id": 500
56
},
67
"install": [
78
{

build/config.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ function group_id() {
1313
jq -r '.user."group-id"' "$(config_file)"
1414
}
1515

16+
function docker_group_id() {
17+
jq -r '.user."docker-group-id"' "$(config_file)"
18+
}
19+
1620
function apt_packages() {
1721
jq -r '.install[] | select(.source == "apt") | .packages[]' "$(config_file)" | paste -sd ' ' -
1822
}

build/tools.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,25 @@ function install_git-lfs() {
3838
rm -rf /tmp/lfs.tar.gz "/tmp/git-lfs-${GIT_LFS_VERSION}"
3939
}
4040

41+
function configure_docker_group_id() {
42+
local desired_gid="$(docker_group_id)"
43+
local current_gid=$(getent group docker | cut -d: -f3)
44+
45+
if [[ "$current_gid" != "$desired_gid" ]]; then
46+
# Expected to fail if the group already exists or the GID is already in use
47+
groupadd --system --gid "$desired_gid" docker 2>/dev/null || true
48+
fi
49+
}
50+
4151
function install_docker-cli() {
52+
configure_docker_group_id
53+
4254
apt-get install -y docker-ce-cli --no-install-recommends --allow-unauthenticated
4355
}
4456

4557
function install_docker() {
58+
configure_docker_group_id
59+
4660
apt-get install -y docker-ce docker-ce-cli docker-buildx-plugin containerd.io docker-compose-plugin --no-install-recommends --allow-unauthenticated
4761

4862
echo -e '#!/bin/sh\ndocker compose --compatibility "$@"' > /usr/local/bin/docker-compose

0 commit comments

Comments
 (0)