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.

Sign up for GitHub

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

Jump to bottom

Allow running Docker container on MacOS (without in-container USB support) #24412

Merged
merged 2 commits into from
Jan 15, 2025
Merged

Allow running Docker container on MacOS (without in-container USB support) #24412

merged 2 commits into from
Jan 15, 2025

Conversation

haimgel
Copy link
Contributor

@haimgel haimgel commented Sep 19, 2024

Description

Allow running Docker container on MacOS (without in-container USB support), if flashing is unnecessary.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 5, 2024

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Nov 5, 2024
@drashna drashna requested a review from a team December 2, 2024 18:24
@drashna drashna removed the stale Issues or pull requests that have become inactive without resolution. label Dec 2, 2024
@oli06
Copy link

oli06 commented Dec 17, 2024

Hi there,
I just ran into the issue of Error: target requires docker-machine to work on your platform on macOS and was confused reading the qmk docker doc and looking at the source code of docker_cmd.sh. I expected that the docker_build.sh script would not even try to run in privileged mode or check for docker-machine on macOS / windows if I'm not trying to flash, i.e. omitting the :target of util/docker_build.sh keyboard:keymap:target. The docs state something like: "if you want to flash, add :target. If you want to flash on macOS / windows you need docker-machine. I concluded that docker-machine would never be checked in the first place).
I would prefer to not use a new env variable to disable the check for docker-machine and instead make it dependent of the flash :target.
I'm new to the qmk firmware so this might not a good advice. Just my 2 cent.

satt99 added a commit to satt99/qmk_firmware that referenced this pull request Jan 4, 2025
@satt99
Skip docker machine check (qmk#24412)
1897644
@tzarc tzarc merged commit 7b83bb9 into qmk:master Jan 15, 2025
2 checks passed
pashashocky pushed a commit to pashashocky/qmk that referenced this pull request Jan 17, 2025
@haimgel @pashashocky
Allow running Docker container on MacOS (without in-container USB sup…
4889b6d 
…port) (qmk#24412)
le4ker pushed a commit to le4ker/lily58-firmware that referenced this pull request Jan 19, 2025
@haimgel @le4ker
Allow running Docker container on MacOS (without in-container USB sup…
88cabac 
…port) (qmk#24412)
vinniefranco pushed a commit to Good-Great-Grand-Wonderful/qmk_firmware that referenced this pull request Jan 20, 2025
@haimgel
Allow running Docker container on MacOS (without in-container USB sup…
41d09ea 
…port) (qmk#24412)
fsecilia pushed a commit to fsecilia/qmk_firmware that referenced this pull request Jan 27, 2025
@haimgel @fsecilia
Allow running Docker container on MacOS (without in-container USB sup…
195d90c 
…port) (qmk#24412)
alk-alyss added a commit to alk-alyss/qmk_firmware that referenced this pull request Jan 30, 2025
@alk-alyss
Merge branch 'master' of https://github.com/qmk/qmk_firmware
07d8f40 
* 'master' of https://github.com/qmk/qmk_firmware: (221 commits)
  Add Keychron C3 Pro (Red & RGB) (qmk#24874)
  [OS Detection] Improve MacOS detection (qmk#24708)
  Bump vite from 5.2.14 to 5.4.12 in /builddefs/docsgen (qmk#24852)
  Reject keyboard.json next to info.json (qmk#24882)
  Add keyboard clap_studio/flame60 (qmk#24870)
  [Keyboard] Add Support E8ghtyNeo (qmk#24859)
  [License Violation] add pressplayid (qmk#24869)
  Fix missing wait.h include in Dip Switch Map (qmk#24863)
  Add Model-B keyboard (qmk#24681)
  Updated Licence Violations for Chosfox L75 (qmk#24833)
  License violations updates. (qmk#24831)
  Add Lily (qmk#24813)
  `kikoslab/kl90`: fix keymap (qmk#24826)
  [Keyboard] Add ic45v2 (qmk#24818)
  Allow running Docker container on MacOS (without in-container USB support) (qmk#24412)
  `salane/ncr80alpsskfl`: add additional layouts (qmk#24809)
  Bump nanoid from 3.3.7 to 3.3.8 in /builddefs/docsgen (qmk#24713)
  Fix a build warning and tidy up a keymap (qmk#24805)
  [Bug] Fix Underglow keycode processing (qmk#24798)
  [Docs] Fix wording in Mod Tap documentation (qmk#24796)
  ...
Rumadon pushed a commit to Rumadon/qmk_firmware that referenced this pull request Jan 31, 2025
@haimgel @Rumadon
Allow running Docker container on MacOS (without in-container USB sup…
7b03db9 
…port) (qmk#24412)
MaximumP pushed a commit to MaximumP/qmk_firmware that referenced this pull request Feb 1, 2025
@haimgel
Allow running Docker container on MacOS (without in-container USB sup…
09c29fa 
…port) (qmk#24412)
alinelena pushed a commit to alinelena/qmk_firmware that referenced this pull request Feb 3, 2025
@haimgel @alinelena
Allow running Docker container on MacOS (without in-container USB sup…
c057a9e 
…port) (qmk#24412)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tzarc tzarc tzarc approved these changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
core documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@haimgel @oli06 @drashna @tzarc