Skip to content

Fix env file resolution - #1099

Merged
bfirsh merged 2 commits into
docker:masterfrom
aanand:fix-env-file-resolution
Mar 13, 2015
Merged

Fix env file resolution#1099
bfirsh merged 2 commits into
docker:masterfrom
aanand:fix-env-file-resolution

Conversation

@aanand

@aanandaanand commented Mar 12, 2015

Copy link
Copy Markdown

Environment variable file paths should be considered relative to the compose file, not to the current directory. These are usually the same, unless the user specifies an alternate one in a different directory with -f.

@aanandaanand mentioned this pull request Mar 12, 2015
Merged
3 tasks
dnephin
dnephin reviewed Mar 13, 2015
View reviewed changes
Comment threadcompose/config.py Outdated

@dnephindnephinMar 13, 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.

It looks like this (merge_service_dicts) isn't used yet. I guess this was pulled in from the other branch?

@dnephin

dnephin commented Mar 13, 2015

Copy link
Copy Markdown

I like it

What about host volume binds with relative paths? Do you plan on addressing those in a separate branch? It seems like volume paths should probably also be relative to the docker-compose.yml to be consistent.

@aanand

aanand commented Mar 13, 2015

Copy link
Copy Markdown
Author

Yes, good point. I'll update it so volume paths are treated similarly.

(That's going to be fun, because we expand ~ and environment variables in volume paths.)

@aanand
Extract YAML loading and parsing into config module
4ecf5e0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Fix environment resolution
528bed9
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
aanandforce-pushed the fix-env-file-resolution branch from 8f26b7b to 528bed9CompareMarch 13, 2015 14:54
@aanand

aanand commented Mar 13, 2015

Copy link
Copy Markdown
Author

After some thought, I'm going to do volume paths separately. This is rebased and ready to go.

@aanandaanand mentioned this pull request Mar 13, 2015
Closed
@bfirsh

bfirsh commented Mar 13, 2015

Copy link
Copy Markdown

LGTM

bfirsh added a commit that referenced this pull request Mar 13, 2015
@bfirsh
Merge pull request#1099from aanand/fix-env-file-resolution
dae4510
Fix env file resolution
@bfirsh
bfirsh merged commit dae4510 into docker:masterMar 13, 2015
@bfirshbfirsh added this to the 1.2.0 milestone Mar 13, 2015
yuval-k pushed a commit to yuval-k/compose that referenced this pull request Apr 10, 2015
@bfirsh
Merge pull requestdocker#1099from aanand/fix-env-file-resolution
a5a4c8e
Fix env file resolution
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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

1.2.0

Development

Successfully merging this pull request may close these issues.

3 participants

@aanand@dnephin@bfirsh
, '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" + '
Fix env file resolution by aanand · Pull Request #1099 · docker/compose · GitHub
Skip to content
Fix env file resolution - #1099
Merged
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Mar 13, 2015
Merged
Fix env file resolution#1099
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Conversation
@aanand
@aanandaanand
commented
Mar 12, 2015

Copy link


Copy Markdown

Environment variable file paths should be considered relative to the compose file, not to the current directory. These are usually the same, unless the user specifies an alternate one in a different directory with -f.
@aanandaanand
mentioned this pull request
Mar 12, 2015
 Merged

3 tasks
dnephin
dnephin
reviewed
Mar 13, 2015
 View reviewed changes

Comment threadcompose/config.py
Outdated

@dnephindnephinMar 13, 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.

It looks like this (merge_service_dicts) isn't used yet. I guess this was pulled in from the other branch?
@dnephin
dnephin
commented
Mar 13, 2015

Copy link


Copy Markdown

I like it
What about host volume binds with relative paths? Do you plan on addressing those in a separate branch? It seems like volume paths should probably also be relative to the docker-compose.yml to be consistent.
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
Yes, good point. I'll update it so volume paths are treated similarly.
(That's going to be fun, because we expand ~ and environment variables in volume paths.)
@aanand
Extract YAML loading and parsing into config module
4ecf5e0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Fix environment resolution
528bed9
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
aanandforce-pushed
the
fix-env-file-resolution
branch
from
8f26b7b to
528bed9CompareMarch 13, 2015 14:54
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
After some thought, I'm going to do volume paths separately. This is rebased and ready to go.
@aanandaanand
mentioned this pull request
Mar 13, 2015

Closed

@bfirsh
bfirsh
commented
Mar 13, 2015

Copy link


Copy Markdown

LGTM
bfirsh added a commit
that referenced
this pull request
Mar 13, 2015
@bfirsh
Merge pull request#1099from aanand/fix-env-file-resolution
dae4510
Fix env file resolution
@bfirsh
bfirsh
merged commit dae4510
into
docker:masterMar 13, 2015
@bfirshbfirsh
added this to the 1.2.0 milestone
Mar 13, 2015
yuval-k pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
@bfirsh
Merge pull requestdocker#1099from aanand/fix-env-file-resolution
a5a4c8e
Fix env file resolution
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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

1.2.0

Development

Successfully merging this pull request may close these issues.

3 participants

@aanand@dnephin@bfirsh

, '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('^' + ".*" + '
Fix env file resolution by aanand · Pull Request #1099 · docker/compose · GitHub
Skip to content
Fix env file resolution - #1099
Merged
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Mar 13, 2015
Merged
Fix env file resolution#1099
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Conversation
@aanand
@aanandaanand
commented
Mar 12, 2015

Copy link


Copy Markdown

Environment variable file paths should be considered relative to the compose file, not to the current directory. These are usually the same, unless the user specifies an alternate one in a different directory with -f.
@aanandaanand
mentioned this pull request
Mar 12, 2015
 Merged

3 tasks
dnephin
dnephin
reviewed
Mar 13, 2015
 View reviewed changes

Comment threadcompose/config.py
Outdated

@dnephindnephinMar 13, 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.

It looks like this (merge_service_dicts) isn't used yet. I guess this was pulled in from the other branch?
@dnephin
dnephin
commented
Mar 13, 2015

Copy link


Copy Markdown

I like it
What about host volume binds with relative paths? Do you plan on addressing those in a separate branch? It seems like volume paths should probably also be relative to the docker-compose.yml to be consistent.
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
Yes, good point. I'll update it so volume paths are treated similarly.
(That's going to be fun, because we expand ~ and environment variables in volume paths.)
@aanand
Extract YAML loading and parsing into config module
4ecf5e0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Fix environment resolution
528bed9
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
aanandforce-pushed
the
fix-env-file-resolution
branch
from
8f26b7b to
528bed9CompareMarch 13, 2015 14:54
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
After some thought, I'm going to do volume paths separately. This is rebased and ready to go.
@aanandaanand
mentioned this pull request
Mar 13, 2015

Closed

@bfirsh
bfirsh
commented
Mar 13, 2015

Copy link


Copy Markdown

LGTM
bfirsh added a commit
that referenced
this pull request
Mar 13, 2015
@bfirsh
Merge pull request#1099from aanand/fix-env-file-resolution
dae4510
Fix env file resolution
@bfirsh
bfirsh
merged commit dae4510
into
docker:masterMar 13, 2015
@bfirshbfirsh
added this to the 1.2.0 milestone
Mar 13, 2015
yuval-k pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
@bfirsh
Merge pull requestdocker#1099from aanand/fix-env-file-resolution
a5a4c8e
Fix env file resolution
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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

1.2.0

Development

Successfully merging this pull request may close these issues.

3 participants

@aanand@dnephin@bfirsh

, '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('^' + ".*" + '
Fix env file resolution by aanand · Pull Request #1099 · docker/compose · GitHub
Skip to content
Fix env file resolution - #1099
Merged
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Mar 13, 2015
Merged
Fix env file resolution#1099
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Conversation
@aanand
@aanandaanand
commented
Mar 12, 2015

Copy link


Copy Markdown

Environment variable file paths should be considered relative to the compose file, not to the current directory. These are usually the same, unless the user specifies an alternate one in a different directory with -f.
@aanandaanand
mentioned this pull request
Mar 12, 2015
 Merged

3 tasks
dnephin
dnephin
reviewed
Mar 13, 2015
 View reviewed changes

Comment threadcompose/config.py
Outdated

@dnephindnephinMar 13, 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.

It looks like this (merge_service_dicts) isn't used yet. I guess this was pulled in from the other branch?
@dnephin
dnephin
commented
Mar 13, 2015

Copy link


Copy Markdown

I like it
What about host volume binds with relative paths? Do you plan on addressing those in a separate branch? It seems like volume paths should probably also be relative to the docker-compose.yml to be consistent.
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
Yes, good point. I'll update it so volume paths are treated similarly.
(That's going to be fun, because we expand ~ and environment variables in volume paths.)
@aanand
Extract YAML loading and parsing into config module
4ecf5e0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Fix environment resolution
528bed9
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
aanandforce-pushed
the
fix-env-file-resolution
branch
from
8f26b7b to
528bed9CompareMarch 13, 2015 14:54
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
After some thought, I'm going to do volume paths separately. This is rebased and ready to go.
@aanandaanand
mentioned this pull request
Mar 13, 2015

Closed

@bfirsh
bfirsh
commented
Mar 13, 2015

Copy link


Copy Markdown

LGTM
bfirsh added a commit
that referenced
this pull request
Mar 13, 2015
@bfirsh
Merge pull request#1099from aanand/fix-env-file-resolution
dae4510
Fix env file resolution
@bfirsh
bfirsh
merged commit dae4510
into
docker:masterMar 13, 2015
@bfirshbfirsh
added this to the 1.2.0 milestone
Mar 13, 2015
yuval-k pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
@bfirsh
Merge pull requestdocker#1099from aanand/fix-env-file-resolution
a5a4c8e
Fix env file resolution
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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

1.2.0

Development

Successfully merging this pull request may close these issues.

3 participants

@aanand@dnephin@bfirsh

, '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" + '
Fix env file resolution by aanand · Pull Request #1099 · docker/compose · GitHub
Skip to content
Fix env file resolution - #1099
Merged
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Mar 13, 2015
Merged
Fix env file resolution#1099
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Conversation
@aanand
@aanandaanand
commented
Mar 12, 2015

Copy link


Copy Markdown

Environment variable file paths should be considered relative to the compose file, not to the current directory. These are usually the same, unless the user specifies an alternate one in a different directory with -f.
@aanandaanand
mentioned this pull request
Mar 12, 2015
 Merged

3 tasks
dnephin
dnephin
reviewed
Mar 13, 2015
 View reviewed changes

Comment threadcompose/config.py
Outdated

@dnephindnephinMar 13, 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.

It looks like this (merge_service_dicts) isn't used yet. I guess this was pulled in from the other branch?
@dnephin
dnephin
commented
Mar 13, 2015

Copy link


Copy Markdown

I like it
What about host volume binds with relative paths? Do you plan on addressing those in a separate branch? It seems like volume paths should probably also be relative to the docker-compose.yml to be consistent.
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
Yes, good point. I'll update it so volume paths are treated similarly.
(That's going to be fun, because we expand ~ and environment variables in volume paths.)
@aanand
Extract YAML loading and parsing into config module
4ecf5e0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Fix environment resolution
528bed9
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
aanandforce-pushed
the
fix-env-file-resolution
branch
from
8f26b7b to
528bed9CompareMarch 13, 2015 14:54
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
After some thought, I'm going to do volume paths separately. This is rebased and ready to go.
@aanandaanand
mentioned this pull request
Mar 13, 2015

Closed

@bfirsh
bfirsh
commented
Mar 13, 2015

Copy link


Copy Markdown

LGTM
bfirsh added a commit
that referenced
this pull request
Mar 13, 2015
@bfirsh
Merge pull request#1099from aanand/fix-env-file-resolution
dae4510
Fix env file resolution
@bfirsh
bfirsh
merged commit dae4510
into
docker:masterMar 13, 2015
@bfirshbfirsh
added this to the 1.2.0 milestone
Mar 13, 2015
yuval-k pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
@bfirsh
Merge pull requestdocker#1099from aanand/fix-env-file-resolution
a5a4c8e
Fix env file resolution
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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

1.2.0

Development

Successfully merging this pull request may close these issues.

3 participants

@aanand@dnephin@bfirsh

, '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('^' + ".*" + '
Fix env file resolution by aanand · Pull Request #1099 · docker/compose · GitHub
Skip to content
Fix env file resolution - #1099
Merged
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Mar 13, 2015
Merged
Fix env file resolution#1099
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Conversation
@aanand
@aanandaanand
commented
Mar 12, 2015

Copy link


Copy Markdown

Environment variable file paths should be considered relative to the compose file, not to the current directory. These are usually the same, unless the user specifies an alternate one in a different directory with -f.
@aanandaanand
mentioned this pull request
Mar 12, 2015
 Merged

3 tasks
dnephin
dnephin
reviewed
Mar 13, 2015
 View reviewed changes

Comment threadcompose/config.py
Outdated

@dnephindnephinMar 13, 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.

It looks like this (merge_service_dicts) isn't used yet. I guess this was pulled in from the other branch?
@dnephin
dnephin
commented
Mar 13, 2015

Copy link


Copy Markdown

I like it
What about host volume binds with relative paths? Do you plan on addressing those in a separate branch? It seems like volume paths should probably also be relative to the docker-compose.yml to be consistent.
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
Yes, good point. I'll update it so volume paths are treated similarly.
(That's going to be fun, because we expand ~ and environment variables in volume paths.)
@aanand
Extract YAML loading and parsing into config module
4ecf5e0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Fix environment resolution
528bed9
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
aanandforce-pushed
the
fix-env-file-resolution
branch
from
8f26b7b to
528bed9CompareMarch 13, 2015 14:54
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
After some thought, I'm going to do volume paths separately. This is rebased and ready to go.
@aanandaanand
mentioned this pull request
Mar 13, 2015

Closed

@bfirsh
bfirsh
commented
Mar 13, 2015

Copy link


Copy Markdown

LGTM
bfirsh added a commit
that referenced
this pull request
Mar 13, 2015
@bfirsh
Merge pull request#1099from aanand/fix-env-file-resolution
dae4510
Fix env file resolution
@bfirsh
bfirsh
merged commit dae4510
into
docker:masterMar 13, 2015
@bfirshbfirsh
added this to the 1.2.0 milestone
Mar 13, 2015
yuval-k pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
@bfirsh
Merge pull requestdocker#1099from aanand/fix-env-file-resolution
a5a4c8e
Fix env file resolution
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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

1.2.0

Development

Successfully merging this pull request may close these issues.

3 participants

@aanand@dnephin@bfirsh

, '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); }
})();
})();
Fix env file resolution by aanand · Pull Request #1099 · docker/compose · GitHub
Skip to content
Fix env file resolution - #1099
Merged
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Mar 13, 2015
Merged
Fix env file resolution#1099
bfirsh merged 2 commits into
docker:masterfrom 
aanand:fix-env-file-resolution
Conversation
@aanand
@aanandaanand
commented
Mar 12, 2015

Copy link


Copy Markdown

Environment variable file paths should be considered relative to the compose file, not to the current directory. These are usually the same, unless the user specifies an alternate one in a different directory with -f.
@aanandaanand
mentioned this pull request
Mar 12, 2015
 Merged

3 tasks
dnephin
dnephin
reviewed
Mar 13, 2015
 View reviewed changes

Comment threadcompose/config.py
Outdated

@dnephindnephinMar 13, 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.

It looks like this (merge_service_dicts) isn't used yet. I guess this was pulled in from the other branch?
@dnephin
dnephin
commented
Mar 13, 2015

Copy link


Copy Markdown

I like it
What about host volume binds with relative paths? Do you plan on addressing those in a separate branch? It seems like volume paths should probably also be relative to the docker-compose.yml to be consistent.
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
Yes, good point. I'll update it so volume paths are treated similarly.
(That's going to be fun, because we expand ~ and environment variables in volume paths.)
@aanand
Extract YAML loading and parsing into config module
4ecf5e0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
Fix environment resolution
528bed9
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
@aanand
aanandforce-pushed
the
fix-env-file-resolution
branch
from
8f26b7b to
528bed9CompareMarch 13, 2015 14:54
@aanand
aanand
commented
Mar 13, 2015

Copy link


Copy Markdown

Author
After some thought, I'm going to do volume paths separately. This is rebased and ready to go.
@aanandaanand
mentioned this pull request
Mar 13, 2015

Closed

@bfirsh
bfirsh
commented
Mar 13, 2015

Copy link


Copy Markdown

LGTM
bfirsh added a commit
that referenced
this pull request
Mar 13, 2015
@bfirsh
Merge pull request#1099from aanand/fix-env-file-resolution
dae4510
Fix env file resolution
@bfirsh
bfirsh
merged commit dae4510
into
docker:masterMar 13, 2015
@bfirshbfirsh
added this to the 1.2.0 milestone
Mar 13, 2015
yuval-k pushed a commit
to yuval-k/compose
that referenced
this pull request
Apr 10, 2015
@bfirsh
Merge pull requestdocker#1099from aanand/fix-env-file-resolution
a5a4c8e
Fix env file resolution
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
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

1.2.0

Development

Successfully merging this pull request may close these issues.

3 participants

@aanand@dnephin@bfirsh