Skip to content

Rename CLI and ExecutableCLI folders - #625

Closed
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder
Closed

Rename CLI and ExecutableCLI folders#625
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder

Conversation

@Mcrich23

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

This is an extension of #603 to cleanup the folder structure and have it match with the new library and target names.

Testing

N/A?

commit 449f1d2
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 13:37:55 2025 -0700
Replace scattered defaults subcommands with `system property`. (apple#604)
Common subcommands for all defaults.
- Closesapple#384.
- Replaces `registry default` and `system dns default` subcommands with
`system property`.
- Users can use `system property ls` to see details about each supported
default value.
- `system property set` implements reasonable validation for all
properties.
- NOTE: Probing of the registry for `registry default set` was removed,
which means users will find out about a botched setting when pulling or
pushing.
- Updates docs.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
See apple#384.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
commit 386fd87
Author: Kathryn Baldauf <k_baldauf@apple.com>
Date: Tue Sep 16 10:52:08 2025 -0700
Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (apple#613)
## Type of Change
- [x] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Fixesapple#588. This PR changes the
archiver compression file enumeration to use the
[enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
version. This version returns relative paths instead of full file paths
from the filesystem. /tmp is symlinked to /private/tmp and some swift
packages will handle that path differently. While a call to Foundation's
`URL.resolvingSymlinksInPath()` will return "/tmp", a call to
`FileManager.enumerator(at:)` will return "/private/tmp". This
difference causes a container image build to fail when the user is using
a path under /tmp or other special case paths as the context directory.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
commit 79cc363
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 10:14:14 2025 -0700
Relocates API server to Helpers, service to Services. (apple#616)
- Closesapple#615.
Improves project organization. Separates service so it can be tested and
used separately from the executable target. No functional changes.
commit a54be36
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Mon Sep 15 11:27:51 2025 -0700
Add `--labels` for networks. (apple#600)
- Closesapple#557.
- Breaking change: removes `.upToNextOption` for labels on volumes as
this is not what is done for containers, and it forces the argument to
precede the options if a label is supplied, which is non-intuitive.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
Consistent features and UX across managed resources.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
@jglogan

Copy link
Copy Markdown
Contributor

Created #631 to track this PR.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

This is having major issues cause of /CLI conflicts @jglogan. What do you think is the best strategy to do this?

commit dd6bdc2
Author: Morris Richman <81453549+Mcrich23@users.noreply.github.com>
Date: Wed Sep 17 15:24:26 2025 -0700
Expose Command Structs for Plugins (apple#603)
## Type of Change
- [ ] Bug fix
- [x] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Plugins technically exist, but to add shortcuts or to do existing things
with functions in `container` requires calling a compiled binary. This
pull request aims to remove that hurdle and instability by exposing
commands as a new `ContainerCommands ` target.
Simply import `ContainerCommands` and you can access almost
any command as if it were a native part of the binary. This makes
plugin development significantly easier.
Closesapple#609.
This reverts commit 70fd2a8.
@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Nevermind. I managed to fix it, but the longer we wait to merge this, the harder it will be to do so.

@Mcrich23
Mcrich23 marked this pull request as ready for review September 17, 2025 23:41
@jglogan

Copy link
Copy Markdown
Contributor

@Mcrich23 the commit history doesn't look right. It looks like your base commit doesn't include the changes we merged from the last PR. Typically, you'd want to do the following, since you created this change before the merge:

git checkout main
git fetch upstream
git merge upstream/main
git checkout rename-cli-folder
git rebase main
git push -f

That would make it so that just the changes for your PR are rebased onto the current HEAD on main.

It might be easiest in this case to close this PR and delete the branch, and start with a new branch and PR from main.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Thats what I am wondering as well. Because this is relatively simple

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Yes. it is hitting a ton of conflicts. Do you mind if I just do that instead?

@jglogan

Copy link
Copy Markdown
Contributor

Definitely. I think it'd be the easiest just to burn this one and start with a fresh branch and PR.

@Mcrich23
Mcrich23 deleted the rename-cli-folder branch September 18, 2025 02:49
@Mcrich23Mcrich23 mentioned this pull request Sep 18, 2025
4 tasks
Sign up for freeto 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

@Mcrich23@jglogan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Rename CLI and ExecutableCLI folders by Mcrich23 · Pull Request #625 · apple/container · GitHub
Skip to content

Rename CLI and ExecutableCLI folders - #625

Closed
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder
Closed

Rename CLI and ExecutableCLI folders#625
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder

Conversation

@Mcrich23

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

This is an extension of #603 to cleanup the folder structure and have it match with the new library and target names.

Testing

N/A?

commit 449f1d2
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 13:37:55 2025 -0700
Replace scattered defaults subcommands with `system property`. (apple#604)
Common subcommands for all defaults.
- Closesapple#384.
- Replaces `registry default` and `system dns default` subcommands with
`system property`.
- Users can use `system property ls` to see details about each supported
default value.
- `system property set` implements reasonable validation for all
properties.
- NOTE: Probing of the registry for `registry default set` was removed,
which means users will find out about a botched setting when pulling or
pushing.
- Updates docs.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
See apple#384.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
commit 386fd87
Author: Kathryn Baldauf <k_baldauf@apple.com>
Date: Tue Sep 16 10:52:08 2025 -0700
Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (apple#613)
## Type of Change
- [x] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Fixesapple#588. This PR changes the
archiver compression file enumeration to use the
[enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
version. This version returns relative paths instead of full file paths
from the filesystem. /tmp is symlinked to /private/tmp and some swift
packages will handle that path differently. While a call to Foundation's
`URL.resolvingSymlinksInPath()` will return "/tmp", a call to
`FileManager.enumerator(at:)` will return "/private/tmp". This
difference causes a container image build to fail when the user is using
a path under /tmp or other special case paths as the context directory.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
commit 79cc363
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 10:14:14 2025 -0700
Relocates API server to Helpers, service to Services. (apple#616)
- Closesapple#615.
Improves project organization. Separates service so it can be tested and
used separately from the executable target. No functional changes.
commit a54be36
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Mon Sep 15 11:27:51 2025 -0700
Add `--labels` for networks. (apple#600)
- Closesapple#557.
- Breaking change: removes `.upToNextOption` for labels on volumes as
this is not what is done for containers, and it forces the argument to
precede the options if a label is supplied, which is non-intuitive.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
Consistent features and UX across managed resources.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
@jglogan

Copy link
Copy Markdown
Contributor

Created #631 to track this PR.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

This is having major issues cause of /CLI conflicts @jglogan. What do you think is the best strategy to do this?

commit dd6bdc2
Author: Morris Richman <81453549+Mcrich23@users.noreply.github.com>
Date: Wed Sep 17 15:24:26 2025 -0700
Expose Command Structs for Plugins (apple#603)
## Type of Change
- [ ] Bug fix
- [x] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Plugins technically exist, but to add shortcuts or to do existing things
with functions in `container` requires calling a compiled binary. This
pull request aims to remove that hurdle and instability by exposing
commands as a new `ContainerCommands ` target.
Simply import `ContainerCommands` and you can access almost
any command as if it were a native part of the binary. This makes
plugin development significantly easier.
Closesapple#609.
This reverts commit 70fd2a8.
@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Nevermind. I managed to fix it, but the longer we wait to merge this, the harder it will be to do so.

@Mcrich23
Mcrich23 marked this pull request as ready for review September 17, 2025 23:41
@jglogan

Copy link
Copy Markdown
Contributor

@Mcrich23 the commit history doesn't look right. It looks like your base commit doesn't include the changes we merged from the last PR. Typically, you'd want to do the following, since you created this change before the merge:

git checkout main
git fetch upstream
git merge upstream/main
git checkout rename-cli-folder
git rebase main
git push -f

That would make it so that just the changes for your PR are rebased onto the current HEAD on main.

It might be easiest in this case to close this PR and delete the branch, and start with a new branch and PR from main.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Thats what I am wondering as well. Because this is relatively simple

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Yes. it is hitting a ton of conflicts. Do you mind if I just do that instead?

@jglogan

Copy link
Copy Markdown
Contributor

Definitely. I think it'd be the easiest just to burn this one and start with a fresh branch and PR.

@Mcrich23
Mcrich23 deleted the rename-cli-folder branch September 18, 2025 02:49
@Mcrich23Mcrich23 mentioned this pull request Sep 18, 2025
4 tasks
Sign up for freeto 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

@Mcrich23@jglogan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Rename CLI and ExecutableCLI folders by Mcrich23 · Pull Request #625 · apple/container · GitHub
Skip to content

Rename CLI and ExecutableCLI folders - #625

Closed
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder
Closed

Rename CLI and ExecutableCLI folders#625
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder

Conversation

@Mcrich23

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

This is an extension of #603 to cleanup the folder structure and have it match with the new library and target names.

Testing

N/A?

commit 449f1d2
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 13:37:55 2025 -0700
Replace scattered defaults subcommands with `system property`. (apple#604)
Common subcommands for all defaults.
- Closesapple#384.
- Replaces `registry default` and `system dns default` subcommands with
`system property`.
- Users can use `system property ls` to see details about each supported
default value.
- `system property set` implements reasonable validation for all
properties.
- NOTE: Probing of the registry for `registry default set` was removed,
which means users will find out about a botched setting when pulling or
pushing.
- Updates docs.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
See apple#384.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
commit 386fd87
Author: Kathryn Baldauf <k_baldauf@apple.com>
Date: Tue Sep 16 10:52:08 2025 -0700
Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (apple#613)
## Type of Change
- [x] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Fixesapple#588. This PR changes the
archiver compression file enumeration to use the
[enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
version. This version returns relative paths instead of full file paths
from the filesystem. /tmp is symlinked to /private/tmp and some swift
packages will handle that path differently. While a call to Foundation's
`URL.resolvingSymlinksInPath()` will return "/tmp", a call to
`FileManager.enumerator(at:)` will return "/private/tmp". This
difference causes a container image build to fail when the user is using
a path under /tmp or other special case paths as the context directory.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
commit 79cc363
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 10:14:14 2025 -0700
Relocates API server to Helpers, service to Services. (apple#616)
- Closesapple#615.
Improves project organization. Separates service so it can be tested and
used separately from the executable target. No functional changes.
commit a54be36
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Mon Sep 15 11:27:51 2025 -0700
Add `--labels` for networks. (apple#600)
- Closesapple#557.
- Breaking change: removes `.upToNextOption` for labels on volumes as
this is not what is done for containers, and it forces the argument to
precede the options if a label is supplied, which is non-intuitive.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
Consistent features and UX across managed resources.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
@jglogan

Copy link
Copy Markdown
Contributor

Created #631 to track this PR.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

This is having major issues cause of /CLI conflicts @jglogan. What do you think is the best strategy to do this?

commit dd6bdc2
Author: Morris Richman <81453549+Mcrich23@users.noreply.github.com>
Date: Wed Sep 17 15:24:26 2025 -0700
Expose Command Structs for Plugins (apple#603)
## Type of Change
- [ ] Bug fix
- [x] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Plugins technically exist, but to add shortcuts or to do existing things
with functions in `container` requires calling a compiled binary. This
pull request aims to remove that hurdle and instability by exposing
commands as a new `ContainerCommands ` target.
Simply import `ContainerCommands` and you can access almost
any command as if it were a native part of the binary. This makes
plugin development significantly easier.
Closesapple#609.
This reverts commit 70fd2a8.
@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Nevermind. I managed to fix it, but the longer we wait to merge this, the harder it will be to do so.

@Mcrich23
Mcrich23 marked this pull request as ready for review September 17, 2025 23:41
@jglogan

Copy link
Copy Markdown
Contributor

@Mcrich23 the commit history doesn't look right. It looks like your base commit doesn't include the changes we merged from the last PR. Typically, you'd want to do the following, since you created this change before the merge:

git checkout main
git fetch upstream
git merge upstream/main
git checkout rename-cli-folder
git rebase main
git push -f

That would make it so that just the changes for your PR are rebased onto the current HEAD on main.

It might be easiest in this case to close this PR and delete the branch, and start with a new branch and PR from main.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Thats what I am wondering as well. Because this is relatively simple

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Yes. it is hitting a ton of conflicts. Do you mind if I just do that instead?

@jglogan

Copy link
Copy Markdown
Contributor

Definitely. I think it'd be the easiest just to burn this one and start with a fresh branch and PR.

@Mcrich23
Mcrich23 deleted the rename-cli-folder branch September 18, 2025 02:49
@Mcrich23Mcrich23 mentioned this pull request Sep 18, 2025
4 tasks
Sign up for freeto 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

@Mcrich23@jglogan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Rename CLI and ExecutableCLI folders by Mcrich23 · Pull Request #625 · apple/container · GitHub
Skip to content

Rename CLI and ExecutableCLI folders - #625

Closed
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder
Closed

Rename CLI and ExecutableCLI folders#625
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder

Conversation

@Mcrich23

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

This is an extension of #603 to cleanup the folder structure and have it match with the new library and target names.

Testing

N/A?

commit 449f1d2
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 13:37:55 2025 -0700
Replace scattered defaults subcommands with `system property`. (apple#604)
Common subcommands for all defaults.
- Closesapple#384.
- Replaces `registry default` and `system dns default` subcommands with
`system property`.
- Users can use `system property ls` to see details about each supported
default value.
- `system property set` implements reasonable validation for all
properties.
- NOTE: Probing of the registry for `registry default set` was removed,
which means users will find out about a botched setting when pulling or
pushing.
- Updates docs.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
See apple#384.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
commit 386fd87
Author: Kathryn Baldauf <k_baldauf@apple.com>
Date: Tue Sep 16 10:52:08 2025 -0700
Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (apple#613)
## Type of Change
- [x] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Fixesapple#588. This PR changes the
archiver compression file enumeration to use the
[enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
version. This version returns relative paths instead of full file paths
from the filesystem. /tmp is symlinked to /private/tmp and some swift
packages will handle that path differently. While a call to Foundation's
`URL.resolvingSymlinksInPath()` will return "/tmp", a call to
`FileManager.enumerator(at:)` will return "/private/tmp". This
difference causes a container image build to fail when the user is using
a path under /tmp or other special case paths as the context directory.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
commit 79cc363
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 10:14:14 2025 -0700
Relocates API server to Helpers, service to Services. (apple#616)
- Closesapple#615.
Improves project organization. Separates service so it can be tested and
used separately from the executable target. No functional changes.
commit a54be36
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Mon Sep 15 11:27:51 2025 -0700
Add `--labels` for networks. (apple#600)
- Closesapple#557.
- Breaking change: removes `.upToNextOption` for labels on volumes as
this is not what is done for containers, and it forces the argument to
precede the options if a label is supplied, which is non-intuitive.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
Consistent features and UX across managed resources.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
@jglogan

Copy link
Copy Markdown
Contributor

Created #631 to track this PR.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

This is having major issues cause of /CLI conflicts @jglogan. What do you think is the best strategy to do this?

commit dd6bdc2
Author: Morris Richman <81453549+Mcrich23@users.noreply.github.com>
Date: Wed Sep 17 15:24:26 2025 -0700
Expose Command Structs for Plugins (apple#603)
## Type of Change
- [ ] Bug fix
- [x] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Plugins technically exist, but to add shortcuts or to do existing things
with functions in `container` requires calling a compiled binary. This
pull request aims to remove that hurdle and instability by exposing
commands as a new `ContainerCommands ` target.
Simply import `ContainerCommands` and you can access almost
any command as if it were a native part of the binary. This makes
plugin development significantly easier.
Closesapple#609.
This reverts commit 70fd2a8.
@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Nevermind. I managed to fix it, but the longer we wait to merge this, the harder it will be to do so.

@Mcrich23
Mcrich23 marked this pull request as ready for review September 17, 2025 23:41
@jglogan

Copy link
Copy Markdown
Contributor

@Mcrich23 the commit history doesn't look right. It looks like your base commit doesn't include the changes we merged from the last PR. Typically, you'd want to do the following, since you created this change before the merge:

git checkout main
git fetch upstream
git merge upstream/main
git checkout rename-cli-folder
git rebase main
git push -f

That would make it so that just the changes for your PR are rebased onto the current HEAD on main.

It might be easiest in this case to close this PR and delete the branch, and start with a new branch and PR from main.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Thats what I am wondering as well. Because this is relatively simple

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Yes. it is hitting a ton of conflicts. Do you mind if I just do that instead?

@jglogan

Copy link
Copy Markdown
Contributor

Definitely. I think it'd be the easiest just to burn this one and start with a fresh branch and PR.

@Mcrich23
Mcrich23 deleted the rename-cli-folder branch September 18, 2025 02:49
@Mcrich23Mcrich23 mentioned this pull request Sep 18, 2025
4 tasks
Sign up for freeto 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

@Mcrich23@jglogan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Rename CLI and ExecutableCLI folders by Mcrich23 · Pull Request #625 · apple/container · GitHub
Skip to content

Rename CLI and ExecutableCLI folders - #625

Closed
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder
Closed

Rename CLI and ExecutableCLI folders#625
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder

Conversation

@Mcrich23

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

This is an extension of #603 to cleanup the folder structure and have it match with the new library and target names.

Testing

N/A?

commit 449f1d2
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 13:37:55 2025 -0700
Replace scattered defaults subcommands with `system property`. (apple#604)
Common subcommands for all defaults.
- Closesapple#384.
- Replaces `registry default` and `system dns default` subcommands with
`system property`.
- Users can use `system property ls` to see details about each supported
default value.
- `system property set` implements reasonable validation for all
properties.
- NOTE: Probing of the registry for `registry default set` was removed,
which means users will find out about a botched setting when pulling or
pushing.
- Updates docs.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
See apple#384.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
commit 386fd87
Author: Kathryn Baldauf <k_baldauf@apple.com>
Date: Tue Sep 16 10:52:08 2025 -0700
Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (apple#613)
## Type of Change
- [x] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Fixesapple#588. This PR changes the
archiver compression file enumeration to use the
[enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
version. This version returns relative paths instead of full file paths
from the filesystem. /tmp is symlinked to /private/tmp and some swift
packages will handle that path differently. While a call to Foundation's
`URL.resolvingSymlinksInPath()` will return "/tmp", a call to
`FileManager.enumerator(at:)` will return "/private/tmp". This
difference causes a container image build to fail when the user is using
a path under /tmp or other special case paths as the context directory.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
commit 79cc363
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 10:14:14 2025 -0700
Relocates API server to Helpers, service to Services. (apple#616)
- Closesapple#615.
Improves project organization. Separates service so it can be tested and
used separately from the executable target. No functional changes.
commit a54be36
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Mon Sep 15 11:27:51 2025 -0700
Add `--labels` for networks. (apple#600)
- Closesapple#557.
- Breaking change: removes `.upToNextOption` for labels on volumes as
this is not what is done for containers, and it forces the argument to
precede the options if a label is supplied, which is non-intuitive.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
Consistent features and UX across managed resources.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
@jglogan

Copy link
Copy Markdown
Contributor

Created #631 to track this PR.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

This is having major issues cause of /CLI conflicts @jglogan. What do you think is the best strategy to do this?

commit dd6bdc2
Author: Morris Richman <81453549+Mcrich23@users.noreply.github.com>
Date: Wed Sep 17 15:24:26 2025 -0700
Expose Command Structs for Plugins (apple#603)
## Type of Change
- [ ] Bug fix
- [x] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Plugins technically exist, but to add shortcuts or to do existing things
with functions in `container` requires calling a compiled binary. This
pull request aims to remove that hurdle and instability by exposing
commands as a new `ContainerCommands ` target.
Simply import `ContainerCommands` and you can access almost
any command as if it were a native part of the binary. This makes
plugin development significantly easier.
Closesapple#609.
This reverts commit 70fd2a8.
@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Nevermind. I managed to fix it, but the longer we wait to merge this, the harder it will be to do so.

@Mcrich23
Mcrich23 marked this pull request as ready for review September 17, 2025 23:41
@jglogan

Copy link
Copy Markdown
Contributor

@Mcrich23 the commit history doesn't look right. It looks like your base commit doesn't include the changes we merged from the last PR. Typically, you'd want to do the following, since you created this change before the merge:

git checkout main
git fetch upstream
git merge upstream/main
git checkout rename-cli-folder
git rebase main
git push -f

That would make it so that just the changes for your PR are rebased onto the current HEAD on main.

It might be easiest in this case to close this PR and delete the branch, and start with a new branch and PR from main.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Thats what I am wondering as well. Because this is relatively simple

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Yes. it is hitting a ton of conflicts. Do you mind if I just do that instead?

@jglogan

Copy link
Copy Markdown
Contributor

Definitely. I think it'd be the easiest just to burn this one and start with a fresh branch and PR.

@Mcrich23
Mcrich23 deleted the rename-cli-folder branch September 18, 2025 02:49
@Mcrich23Mcrich23 mentioned this pull request Sep 18, 2025
4 tasks
Sign up for freeto 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

@Mcrich23@jglogan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Rename CLI and ExecutableCLI folders by Mcrich23 · Pull Request #625 · apple/container · GitHub
Skip to content

Rename CLI and ExecutableCLI folders - #625

Closed
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder
Closed

Rename CLI and ExecutableCLI folders#625
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder

Conversation

@Mcrich23

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

This is an extension of #603 to cleanup the folder structure and have it match with the new library and target names.

Testing

N/A?

commit 449f1d2
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 13:37:55 2025 -0700
Replace scattered defaults subcommands with `system property`. (apple#604)
Common subcommands for all defaults.
- Closesapple#384.
- Replaces `registry default` and `system dns default` subcommands with
`system property`.
- Users can use `system property ls` to see details about each supported
default value.
- `system property set` implements reasonable validation for all
properties.
- NOTE: Probing of the registry for `registry default set` was removed,
which means users will find out about a botched setting when pulling or
pushing.
- Updates docs.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
See apple#384.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
commit 386fd87
Author: Kathryn Baldauf <k_baldauf@apple.com>
Date: Tue Sep 16 10:52:08 2025 -0700
Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (apple#613)
## Type of Change
- [x] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Fixesapple#588. This PR changes the
archiver compression file enumeration to use the
[enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
version. This version returns relative paths instead of full file paths
from the filesystem. /tmp is symlinked to /private/tmp and some swift
packages will handle that path differently. While a call to Foundation's
`URL.resolvingSymlinksInPath()` will return "/tmp", a call to
`FileManager.enumerator(at:)` will return "/private/tmp". This
difference causes a container image build to fail when the user is using
a path under /tmp or other special case paths as the context directory.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
commit 79cc363
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 10:14:14 2025 -0700
Relocates API server to Helpers, service to Services. (apple#616)
- Closesapple#615.
Improves project organization. Separates service so it can be tested and
used separately from the executable target. No functional changes.
commit a54be36
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Mon Sep 15 11:27:51 2025 -0700
Add `--labels` for networks. (apple#600)
- Closesapple#557.
- Breaking change: removes `.upToNextOption` for labels on volumes as
this is not what is done for containers, and it forces the argument to
precede the options if a label is supplied, which is non-intuitive.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
Consistent features and UX across managed resources.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
@jglogan

Copy link
Copy Markdown
Contributor

Created #631 to track this PR.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

This is having major issues cause of /CLI conflicts @jglogan. What do you think is the best strategy to do this?

commit dd6bdc2
Author: Morris Richman <81453549+Mcrich23@users.noreply.github.com>
Date: Wed Sep 17 15:24:26 2025 -0700
Expose Command Structs for Plugins (apple#603)
## Type of Change
- [ ] Bug fix
- [x] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Plugins technically exist, but to add shortcuts or to do existing things
with functions in `container` requires calling a compiled binary. This
pull request aims to remove that hurdle and instability by exposing
commands as a new `ContainerCommands ` target.
Simply import `ContainerCommands` and you can access almost
any command as if it were a native part of the binary. This makes
plugin development significantly easier.
Closesapple#609.
This reverts commit 70fd2a8.
@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Nevermind. I managed to fix it, but the longer we wait to merge this, the harder it will be to do so.

@Mcrich23
Mcrich23 marked this pull request as ready for review September 17, 2025 23:41
@jglogan

Copy link
Copy Markdown
Contributor

@Mcrich23 the commit history doesn't look right. It looks like your base commit doesn't include the changes we merged from the last PR. Typically, you'd want to do the following, since you created this change before the merge:

git checkout main
git fetch upstream
git merge upstream/main
git checkout rename-cli-folder
git rebase main
git push -f

That would make it so that just the changes for your PR are rebased onto the current HEAD on main.

It might be easiest in this case to close this PR and delete the branch, and start with a new branch and PR from main.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Thats what I am wondering as well. Because this is relatively simple

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Yes. it is hitting a ton of conflicts. Do you mind if I just do that instead?

@jglogan

Copy link
Copy Markdown
Contributor

Definitely. I think it'd be the easiest just to burn this one and start with a fresh branch and PR.

@Mcrich23
Mcrich23 deleted the rename-cli-folder branch September 18, 2025 02:49
@Mcrich23Mcrich23 mentioned this pull request Sep 18, 2025
4 tasks
Sign up for freeto 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

@Mcrich23@jglogan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Rename CLI and ExecutableCLI folders by Mcrich23 · Pull Request #625 · apple/container · GitHub
Skip to content

Rename CLI and ExecutableCLI folders - #625

Closed
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder
Closed

Rename CLI and ExecutableCLI folders#625
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder

Conversation

@Mcrich23

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

This is an extension of #603 to cleanup the folder structure and have it match with the new library and target names.

Testing

N/A?

commit 449f1d2
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 13:37:55 2025 -0700
Replace scattered defaults subcommands with `system property`. (apple#604)
Common subcommands for all defaults.
- Closesapple#384.
- Replaces `registry default` and `system dns default` subcommands with
`system property`.
- Users can use `system property ls` to see details about each supported
default value.
- `system property set` implements reasonable validation for all
properties.
- NOTE: Probing of the registry for `registry default set` was removed,
which means users will find out about a botched setting when pulling or
pushing.
- Updates docs.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
See apple#384.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
commit 386fd87
Author: Kathryn Baldauf <k_baldauf@apple.com>
Date: Tue Sep 16 10:52:08 2025 -0700
Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (apple#613)
## Type of Change
- [x] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Fixesapple#588. This PR changes the
archiver compression file enumeration to use the
[enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
version. This version returns relative paths instead of full file paths
from the filesystem. /tmp is symlinked to /private/tmp and some swift
packages will handle that path differently. While a call to Foundation's
`URL.resolvingSymlinksInPath()` will return "/tmp", a call to
`FileManager.enumerator(at:)` will return "/private/tmp". This
difference causes a container image build to fail when the user is using
a path under /tmp or other special case paths as the context directory.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
commit 79cc363
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 10:14:14 2025 -0700
Relocates API server to Helpers, service to Services. (apple#616)
- Closesapple#615.
Improves project organization. Separates service so it can be tested and
used separately from the executable target. No functional changes.
commit a54be36
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Mon Sep 15 11:27:51 2025 -0700
Add `--labels` for networks. (apple#600)
- Closesapple#557.
- Breaking change: removes `.upToNextOption` for labels on volumes as
this is not what is done for containers, and it forces the argument to
precede the options if a label is supplied, which is non-intuitive.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
Consistent features and UX across managed resources.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
@jglogan

Copy link
Copy Markdown
Contributor

Created #631 to track this PR.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

This is having major issues cause of /CLI conflicts @jglogan. What do you think is the best strategy to do this?

commit dd6bdc2
Author: Morris Richman <81453549+Mcrich23@users.noreply.github.com>
Date: Wed Sep 17 15:24:26 2025 -0700
Expose Command Structs for Plugins (apple#603)
## Type of Change
- [ ] Bug fix
- [x] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Plugins technically exist, but to add shortcuts or to do existing things
with functions in `container` requires calling a compiled binary. This
pull request aims to remove that hurdle and instability by exposing
commands as a new `ContainerCommands ` target.
Simply import `ContainerCommands` and you can access almost
any command as if it were a native part of the binary. This makes
plugin development significantly easier.
Closesapple#609.
This reverts commit 70fd2a8.
@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Nevermind. I managed to fix it, but the longer we wait to merge this, the harder it will be to do so.

@Mcrich23
Mcrich23 marked this pull request as ready for review September 17, 2025 23:41
@jglogan

Copy link
Copy Markdown
Contributor

@Mcrich23 the commit history doesn't look right. It looks like your base commit doesn't include the changes we merged from the last PR. Typically, you'd want to do the following, since you created this change before the merge:

git checkout main
git fetch upstream
git merge upstream/main
git checkout rename-cli-folder
git rebase main
git push -f

That would make it so that just the changes for your PR are rebased onto the current HEAD on main.

It might be easiest in this case to close this PR and delete the branch, and start with a new branch and PR from main.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Thats what I am wondering as well. Because this is relatively simple

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Yes. it is hitting a ton of conflicts. Do you mind if I just do that instead?

@jglogan

Copy link
Copy Markdown
Contributor

Definitely. I think it'd be the easiest just to burn this one and start with a fresh branch and PR.

@Mcrich23
Mcrich23 deleted the rename-cli-folder branch September 18, 2025 02:49
@Mcrich23Mcrich23 mentioned this pull request Sep 18, 2025
4 tasks
Sign up for freeto 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

@Mcrich23@jglogan
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Rename CLI and ExecutableCLI folders by Mcrich23 · Pull Request #625 · apple/container · GitHub
Skip to content

Rename CLI and ExecutableCLI folders - #625

Closed
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder
Closed

Rename CLI and ExecutableCLI folders#625
Mcrich23 wants to merge 39 commits into
apple:mainfrom
Mcrich23:rename-cli-folder

Conversation

@Mcrich23

Copy link
Copy Markdown
Contributor

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

This is an extension of #603 to cleanup the folder structure and have it match with the new library and target names.

Testing

N/A?

commit 449f1d2
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 13:37:55 2025 -0700
Replace scattered defaults subcommands with `system property`. (apple#604)
Common subcommands for all defaults.
- Closesapple#384.
- Replaces `registry default` and `system dns default` subcommands with
`system property`.
- Users can use `system property ls` to see details about each supported
default value.
- `system property set` implements reasonable validation for all
properties.
- NOTE: Probing of the registry for `registry default set` was removed,
which means users will find out about a botched setting when pulling or
pushing.
- Updates docs.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
See apple#384.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
commit 386fd87
Author: Kathryn Baldauf <k_baldauf@apple.com>
Date: Tue Sep 16 10:52:08 2025 -0700
Enumerate using relative paths to avoid mismatch with symlink resolution of special paths like /tmp (apple#613)
## Type of Change
- [x] Bug fix
- [ ] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Fixesapple#588. This PR changes the
archiver compression file enumeration to use the
[enumerator(atPath:)](https://developer.apple.com/documentation/foundation/filemanager/enumerator(atpath:))
version. This version returns relative paths instead of full file paths
from the filesystem. /tmp is symlinked to /private/tmp and some swift
packages will handle that path differently. While a call to Foundation's
`URL.resolvingSymlinksInPath()` will return "/tmp", a call to
`FileManager.enumerator(at:)` will return "/private/tmp". This
difference causes a container image build to fail when the user is using
a path under /tmp or other special case paths as the context directory.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [ ] Added/updated docs
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
commit 79cc363
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Tue Sep 16 10:14:14 2025 -0700
Relocates API server to Helpers, service to Services. (apple#616)
- Closesapple#615.
Improves project organization. Separates service so it can be tested and
used separately from the executable target. No functional changes.
commit a54be36
Author: J Logan <sgtbakerrahulnet@yahoo.com>
Date: Mon Sep 15 11:27:51 2025 -0700
Add `--labels` for networks. (apple#600)
- Closesapple#557.
- Breaking change: removes `.upToNextOption` for labels on volumes as
this is not what is done for containers, and it forces the argument to
precede the options if a label is supplied, which is non-intuitive.
## Type of Change
- [ ] Bug fix
- [x] New feature
- [x] Breaking change
- [x] Documentation update
## Motivation and Context
Consistent features and UX across managed resources.
## Testing
- [x] Tested locally
- [x] Added/updated tests
- [x] Added/updated docs
@jglogan

Copy link
Copy Markdown
Contributor

Created #631 to track this PR.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

This is having major issues cause of /CLI conflicts @jglogan. What do you think is the best strategy to do this?

commit dd6bdc2
Author: Morris Richman <81453549+Mcrich23@users.noreply.github.com>
Date: Wed Sep 17 15:24:26 2025 -0700
Expose Command Structs for Plugins (apple#603)
## Type of Change
- [ ] Bug fix
- [x] New feature
- [ ] Breaking change
- [ ] Documentation update
## Motivation and Context
Plugins technically exist, but to add shortcuts or to do existing things
with functions in `container` requires calling a compiled binary. This
pull request aims to remove that hurdle and instability by exposing
commands as a new `ContainerCommands ` target.
Simply import `ContainerCommands` and you can access almost
any command as if it were a native part of the binary. This makes
plugin development significantly easier.
Closesapple#609.
This reverts commit 70fd2a8.
@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Nevermind. I managed to fix it, but the longer we wait to merge this, the harder it will be to do so.

@Mcrich23
Mcrich23 marked this pull request as ready for review September 17, 2025 23:41
@jglogan

Copy link
Copy Markdown
Contributor

@Mcrich23 the commit history doesn't look right. It looks like your base commit doesn't include the changes we merged from the last PR. Typically, you'd want to do the following, since you created this change before the merge:

git checkout main
git fetch upstream
git merge upstream/main
git checkout rename-cli-folder
git rebase main
git push -f

That would make it so that just the changes for your PR are rebased onto the current HEAD on main.

It might be easiest in this case to close this PR and delete the branch, and start with a new branch and PR from main.

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Thats what I am wondering as well. Because this is relatively simple

@Mcrich23

Copy link
Copy Markdown
ContributorAuthor

Yes. it is hitting a ton of conflicts. Do you mind if I just do that instead?

@jglogan

Copy link
Copy Markdown
Contributor

Definitely. I think it'd be the easiest just to burn this one and start with a fresh branch and PR.

@Mcrich23
Mcrich23 deleted the rename-cli-folder branch September 18, 2025 02:49
@Mcrich23Mcrich23 mentioned this pull request Sep 18, 2025
4 tasks
Sign up for freeto 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

@Mcrich23@jglogan