Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker_* helpers: pass usb host controllers to docker only if usb devices are connected, unify, bugfixes #1856

Merged

Conversation

tlaurion
Copy link
Collaborator

This pull request includes changes to improve the handling of Docker images and the management of USB devices in the docker_latest.sh, docker_local_dev.sh, and docker_repro.sh scripts. The most important changes include setting Docker image variables, enhancing the kill_usb_processes function, and modifying the Docker run commands to handle USB device access more intelligently.

Docker Image Handling:

  • Added a DOCKER_IMAGE variable to store the Docker image name in docker_latest.sh and docker_local_dev.sh. This improves consistency and makes it easier to update the image name in the future. [1] [2]

USB Device Management:

  • Enhanced the kill_usb_processes function to check if scdaemon or pcscd processes are using USB devices before attempting to kill them. This prevents unnecessary error messages and ensures only relevant processes are targeted. [1] [2] [3]

Docker Run Command:

  • Modified the Docker run commands to conditionally include USB device access based on the presence of USB devices on the host. This ensures that the Docker container is launched with appropriate permissions and resources. [1] [2] [3]

…ices are connected, unify, bugfixes

Signed-off-by: Thierry Laurion <[email protected]>
@tlaurion
Copy link
Collaborator Author

extends #1855

@tlaurion tlaurion merged commit be0aac6 into linuxboot:master Nov 21, 2024
1 check passed
@tlaurion
Copy link
Collaborator Author

tlaurion commented Nov 21, 2024

Restarted CircleCI changing CACHE_VERSION so it builds clean. Wasn't able to get same hashes from local build of #1855 from clean checkout.

Edit: fixed with #1858

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant