Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"user": {
"user-id": 1001,
"group-id": 121
"group-id": 121,
"docker-group-id": 500
},
"install": [
{
Expand Down
4 changes: 4 additions & 0 deletions build/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ' ' -
}
Expand Down
2 changes: 2 additions & 0 deletions build/install_base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down