') + ')', '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); } })(); })(); Added devices config handling and device HostConfig handling by DanElbert · Pull Request #1400 · docker/compose · GitHub
Skip to content

Added devices config handling and device HostConfig handling - #1400

Merged
dnephin merged 1 commit into
docker:masterfrom
DanElbert:754-device_option
May 11, 2015
Merged

Added devices config handling and device HostConfig handling#1400
dnephin merged 1 commit into
docker:masterfrom
DanElbert:754-device_option

Conversation

@DanElbert

@DanElbertDanElbert commented May 8, 2015

Copy link
Copy Markdown

I'm new to contributing to compose, but this is a stab at adding the device option to the yml config, as per issue #754.

@dnephin

dnephin commented May 9, 2015

Copy link
Copy Markdown

I think this is a good start. I believe we also need to update compose/config.py to be able to merge the lists of devices when using extends

@DanElbert

DanElbert commented May 9, 2015

Copy link
Copy Markdown
Author

I've updated the pull request.

aanand
aanand reviewed May 11, 2015
View reviewed changes
Comment threaddocs/yml.md Outdated

@aanandaanandMay 11, 2015

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

  • First sentence is unnecessary
  • --device should be in backticks
  • Wrap to 80 chars please!

@aanand

aanand commented May 11, 2015

Copy link
Copy Markdown

Thanks!

For the sake of consistency, we should support a mapping as well as a list. Is that supported? If so, it should be documented.

@aanand

aanand commented May 11, 2015

Copy link
Copy Markdown

For the sake of consistency, we should support a mapping as well as a list.

I retract this, as I was thinking about environment variables. We don't support YAML mappings for volumes. Sorry for the noise.

This looks good - just needs squashing to a single commit.

@DanElbert

DanElbert commented May 11, 2015

Copy link
Copy Markdown
Author

Thanks for the feedback. I was just going to ask about the mapping. :)

@delbert-umn@DanElbert
Added devices configuration option
df87bd9
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
@DanElbert

DanElbert commented May 11, 2015

Copy link
Copy Markdown
Author

All squashed. Let me know if I missed anything else.

@aanand

aanand commented May 11, 2015

Copy link
Copy Markdown

LGTM

1 similar comment
@dnephin

dnephin commented May 11, 2015

Copy link
Copy Markdown

LGTM

dnephin added a commit that referenced this pull request May 11, 2015
@dnephin
Merge pull request#1400from DanElbert/754-device_option
4997fac
Added devices config handling and device HostConfig handling
@dnephin
dnephin merged commit 4997fac into docker:masterMay 11, 2015
@vdemeestervdemeester mentioned this pull request May 11, 2015
Closed
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.

5 participants

@DanElbert@dnephin@aanand@GordonTheTurtle@delbert-umn