Skip to content

Commit 3c7e244

Browse files
authored
Merge pull request #1011 from thockin/main
Update image spec and conversion to clarify groups
2 parents 24027e1 + 98f35df commit 3c7e244

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

config.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ Note: Any OPTIONAL field MAY also be set to null, which is equivalent to being a
138138
The username or UID which is a platform-specific structure that allows specific control over which user the process run as.
139139
This acts as a default value to use when the value is not specified when creating a container.
140140
For Linux based systems, all of the following are valid: `user`, `uid`, `user:group`, `uid:gid`, `uid:group`, `user:gid`.
141-
If `group`/`gid` is not specified, the default group and supplementary groups of the given `user`/`uid` in `/etc/passwd` from the container are applied.
141+
If `group`/`gid` is not specified, the default group and supplementary groups of the given `user`/`uid` in `/etc/passwd` and `/etc/group` from the container are applied.
142+
If `group`/`gid` is specified, supplementary groups from the container are ignored.
142143

143144
- **ExposedPorts** *object*, OPTIONAL
144145

conversion.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ For Unix-like systems, this MAY involve resolution through NSS or parsing `/etc/
8383

8484
In addition, a converter SHOULD set the value of `process.user.additionalGids` to a value corresponding to the user in the container's context described by `Config.User`.
8585
For Unix-like systems, this MAY involve resolution through NSS or parsing `/etc/group` and determining the group memberships of the user specified in `process.user.uid`.
86-
If the value of [`user`](config.md#properties) in `Config.User` is numeric, the converter SHOULD NOT modify `process.user.additionalGids`.
86+
The converter SHOULD NOT modify `process.user.additionalGids` if the value of [`user`](config.md#properties) in `Config.User` is numeric or if `Config.User` specifies a group.
8787

8888
If `Config.User` is not defined, the converted `process.user` value is implementation-defined.
8989
If `Config.User` does not correspond to a user in the container's context, the converter MUST return an error.

0 commit comments

Comments
 (0)