Skip to content

[ci] add more docker groups to work with buildkite amis#53640

Merged
aslonnie merged 1 commit intomasterfrom
lonnie-250607-dockeruser
Jun 9, 2025
Merged

[ci] add more docker groups to work with buildkite amis#53640
aslonnie merged 1 commit intomasterfrom
lonnie-250607-dockeruser

Conversation

@aslonnie
Copy link
Copy Markdown
Collaborator

@aslonnie aslonnie commented Jun 7, 2025

different group names for buildkite amis from different eras

Copilot AI review requested due to automatic review settings June 7, 2025 23:48
@aslonnie aslonnie requested a review from a team as a code owner June 7, 2025 23:48
@aslonnie aslonnie requested review from elliot-barn and khluu June 7, 2025 23:48
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates Docker configurations to support multiple Buildkite AMI group IDs across different eras by adding and mapping new group entries.

  • Add separate docker0, docker1, and updated docker group GIDs for various AMI versions.
  • Ensure the forge user is added to all relevant Docker groups.
  • Mirror these changes in the release-automation Dockerfile for x86_64.

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
ci/docker/forge.Dockerfile Added docker0, docker1, and updated docker group GIDs and usermods.
.buildkite/release-automation/forge_x86_64.Dockerfile Added docker1 group and usermod for the release automation container.
Comments suppressed due to low confidence (2)

ci/docker/forge.Dockerfile:49

  • [nitpick] The group name docker1 is ambiguous. Consider using a more descriptive name (e.g., docker_legacy_993) or expand the comment to clearly explain its purpose.
addgroup --gid 993 docker1

ci/docker/forge.Dockerfile:50

  • Adding the docker group may fail if a group with that name already exists in the base image. Consider checking for its existence (e.g., getent group docker || addgroup ...) or using groupmod to adjust its GID.
addgroup --gid 992 docker    # buildkite AMI as of 2025-06-07

# Needs to be synchronized to the host group id as we map /var/run/docker.sock
# into the container.
addgroup --gid 993 docker
addgroup --gid 992 docker1 # docker group on buildkite AMI as of 2025-06-07
Copy link

Copilot AI Jun 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] These group definitions are duplicated in multiple Dockerfiles. Consider extracting them into a shared script or parameterizing the GIDs via build arguments to reduce duplication and ease future updates.

Copilot uses AI. Check for mistakes.
different group names for buildkite amis from different eras

Signed-off-by: Lonnie Liu <lonnie@anyscale.com>
@aslonnie aslonnie force-pushed the lonnie-250607-dockeruser branch from 5b62439 to 1229b3d Compare June 8, 2025 09:13
@aslonnie
Copy link
Copy Markdown
Collaborator Author

aslonnie commented Jun 9, 2025

merging to fix CI builds.

@aslonnie aslonnie merged commit c54437c into master Jun 9, 2025
5 checks passed
@aslonnie aslonnie deleted the lonnie-250607-dockeruser branch June 9, 2025 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants