') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); ArchiveWriter: support explicit entries and rewrite internal symlinks by mazdak · Pull Request #652 · apple/containerization · GitHub
Skip to content

ArchiveWriter: support explicit entries and rewrite internal symlinks - #652

Open
mazdak wants to merge 2 commits into
apple:mainfrom
mazdak:mazdak/archive-writer-symlink
Open

ArchiveWriter: support explicit entries and rewrite internal symlinks#652
mazdak wants to merge 2 commits into
apple:mainfrom
mazdak:mazdak/archive-writer-symlink

Conversation

@mazdak

@mazdakmazdak commented Apr 5, 2026•
edited
Loading

Copy link
Copy Markdown

Context and Motivation

While building out a Docker Compose-style plugin and validating it against our own real development stack, we ran into two classes of problems in the build-context path, and to fix them we had to make changes to the container app, but part of the changes were archive-authoring concerns and belong in ContainerizationArchive, not in higher-level callers. The result is a reusable API for explicit archive creation and more portable archives when symlinks point to other archived content.

(Related container PR: apple/container#1391)

This PR adds a generic explicit-entry archive API to ContainerizationArchive and improves symlink handling so archives remain relocatable after extraction.

In addition to archiveDirectory(_:), callers can now provide an ordered list of source entries to archive. This makes it possible to archive a precomputed file set without rewalking the source tree and centralizes symlink handling in the archive layer itself.

Testing

  • add regression coverage for explicit-entry archive creation
  • add round-trip tests for:
    • internal absolute symlinks rewritten to archive-relative paths
    • external absolute symlinks preserved unchanged
    • canonicalized internal absolute symlinks through symlinked ancestors
  • verify existing archive-directory symlink behavior still passes

Passed:

  • swift test --filter archiveEntries
  • swift test --filter archiveDirectoryRewritesInternalAbsoluteSymlink
  • swift test --filter archiveDirectorySymlinkInside
  • swift test --filter archiveDirectorySymlinkOutsideExcluded

This was referenced Apr 5, 2026
Open
Closed
@jglogan

jglogan commented Apr 8, 2026

Copy link
Copy Markdown
Contributor

@mazdak Sorry I've not looked closely enough at the changes yet, I've been swamped.

I'll get some feedback on this by Friday. I still need to look at the code more closely to see where this best fits.

@jgloganjglogan mentioned this pull request Apr 21, 2026
Merged
@mazdak
mazdakforce-pushed the mazdak/archive-writer-symlink branch from a25f55e to d04d8dcCompareJune 3, 2026 19:54
stephenlclarke added a commit to stephenlclarke/container-compose that referenced this pull request Jul 12, 2026
@stephenlclarke
feat(cp): support stdio archive streams
393b81b
Supports Docker Compose cp - archive streams for stdin-to-service and service-to-stdout copies by staging tar streams through the compose layer and existing Apple path-copy APIs.
Pins stephenlclarke/containerization@79b675d so the runtime carries the apple/container#1927 copy lifecycle regression coverage from apple/containerization#799.
Upstream scan found no direct Docker Compose copy-stream PR to import; adjacent Apple work reviewed: apple/container#963, apple/containerization#652, apple/container#1832, apple/container#1905.
Release-Highlight: Support Docker Compose cp - archive streams for stdin-to-service and service-to-stdout copies; includes apple/container#1927 copy lifecycle fix via apple/containerization#799.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mazdak@jglogan