Skip to content

Add extra_hosts to yml configuration --add-hosts - #1158

Merged
aanand merged 4 commits into
docker:masterfrom
chernjie:addhosts
Apr 27, 2015
Merged

Add extra_hosts to yml configuration --add-hosts#1158
aanand merged 4 commits into
docker:masterfrom
chernjie:addhosts

Conversation

@chernjie

@chernjiechernjie commented Mar 23, 2015

Copy link
Copy Markdown

@chernjiechernjie changed the title Addhosts--add-hostsMar 23, 2015
@chernjie
chernjieforce-pushed the addhosts branch 3 times, most recently from 1f61beb to 72f4e02CompareMarch 24, 2015 01:10
@chernjie

chernjie commented Mar 24, 2015

Copy link
Copy Markdown
Author

@tdesvenain@sampwing I have signed your commits after rebasing from the latest master.

@tdesvenain

tdesvenain commented Mar 24, 2015

Copy link
Copy Markdown

Great, thanks !

@chernjie

chernjie commented Mar 24, 2015

Copy link
Copy Markdown
Author

I am wondering if it is possible to add an alias to extra_hosts, e.g. hosts

hosts:
- docker: 162.242.195.82
- fig: 50.31.209.229

Thoughts?

@chernjiechernjie changed the title --add-hostsAdd extra_hosts to yml configuration --add-hostsMar 24, 2015
@pedrokiefer

pedrokiefer commented Mar 27, 2015

Copy link
Copy Markdown

Shouldn't it be possible to add and extra_host that is another container, but not actually linked to the current container.

Something like:

web:
build: .
worker:
build: .
extra_hosts:
- web

@aanand

aanand commented Mar 27, 2015

Copy link
Copy Markdown

@pedrokiefer Why not just use a link? You'll get the /etc/hosts entry.

@chernjie

chernjie commented Mar 28, 2015

Copy link
Copy Markdown
Author

@pedrokiefer : What @aanand said, use link for containers, use extra_hosts for non-containers

@pedrokiefer

pedrokiefer commented Mar 28, 2015

Copy link
Copy Markdown

I had some kind of circular dependency between containers, so I thought extra_hosts would solve that to me.

@chernjie
chernjieforce-pushed the addhosts branch 3 times, most recently from 7d0ac5b to 7bf8f3aCompareMarch 28, 2015 19:21
@chernjie

chernjie commented Mar 29, 2015

Copy link
Copy Markdown
Author

rebased with CI fixes

@chernjie
chernjieforce-pushed the addhosts branch 10 times, most recently from 76f5fcb to b68130aCompareMarch 30, 2015 08:02
@chernjie

chernjie commented Mar 30, 2015

Copy link
Copy Markdown
Author

@aanand I would appreciate your feedback/input with this PR. The integration tests are working well. Is there anything that I have missed?

aanand
aanand reviewed Mar 30, 2015
View reviewed changes
Comment threadcompose/service.py Outdated

@aanandaanandMar 30, 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.

basestring should be six.string_types() for Python 3 compatibility

@chernjie

chernjie commented Apr 15, 2015

Copy link
Copy Markdown
Author

Added .sort instead of set, would this work?
cc: @aanand

@chernjie

chernjie commented Apr 20, 2015

Copy link
Copy Markdown
Author

@aanand any updates to this PR? Any feedback would be appreciated

@aanand

aanand commented Apr 21, 2015

Copy link
Copy Markdown

set(...) is preferable for consistency with other tests.

@sampwing@chernjie
added the extra_hosts option to the yml configuration which exposes t…
fb81c37
…he --add-host flag from the docker client
Signed-off-by: Sam Wing <sampwing@gmail.com>
@chernjie

chernjie commented Apr 23, 2015

Copy link
Copy Markdown
Author

@aanand Updated with set(...)

@aanand

aanand commented Apr 23, 2015

Copy link
Copy Markdown

Fantastic. Could you squash and rebase? Thanks.

tdesvenainand others added 2 commits April 24, 2015 09:21
@tdesvenain@chernjie
Fix when pyyaml has interpreted line as a dictionary
8098b65
Added unit tests in build_extra_hosts + fix
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
Remove extra s from --add-host
25ee3f0
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312)
I think it'd be better to check `if not isinstance(extra_hosts_line,
six.string_types)` and raise an error saying `extra_hosts_config must be
either a list of strings or a string->string mapping`. We shouldn't need
to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()
Signed-off-by: CJ <lim@chernjie.com>
@chernjie

chernjie commented Apr 24, 2015

Copy link
Copy Markdown
Author

@aanand I have rebased and squashed all my commits. I have left the other author's contribution as individual commit so as not to lose their contribution information. I hope that's okay

dnephin
dnephin reviewed Apr 24, 2015
View reviewed changes
Comment threadcompose/config.py

@dnephindnephinApr 24, 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.

maybe 'extra_host': 'extra_hosts', as well ?

@chernjiechernjieApr 27, 2015

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Added @ 86a08c0

@dnephin

dnephin commented Apr 24, 2015

Copy link
Copy Markdown

I like this, I think it addresses the "external" type described in #988

LGTM

@dnephindnephin mentioned this pull request Apr 26, 2015
Closed
@chernjie
Seedocker#1158 (comment)
86a08c0
Signed-off-by: CJ <lim@chernjie.com>
@aanand

aanand commented Apr 27, 2015

Copy link
Copy Markdown

LGTM

aanand added a commit that referenced this pull request Apr 27, 2015
@aanand
Merge pull request#1158from chernjie/addhosts
16f8106
Add extra_hosts to yml configuration --add-hosts
@aanand
aanand merged commit 16f8106 into docker:masterApr 27, 2015
@aanandaanand added this to the 1.3.0 milestone Apr 27, 2015
@aanandaanand mentioned this pull request Apr 30, 2015
Closed
@rysiekpl

rysiekpl commented Jun 15, 2015

Copy link
Copy Markdown

Oh this is sweet, and I'm kind of craving this feature right now. Any date set for 1.3.0 release?

@bfirshbfirsh mentioned this pull request Jul 6, 2015
Closed
5 tasks
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.3.0

Development

Successfully merging this pull request may close these issues.

8 participants

@chernjie@tdesvenain@pedrokiefer@aanand@dnephin@rysiekpl@GordonTheTurtle@sampwing
, '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" + '
Add extra_hosts to yml configuration --add-hosts by chernjie · Pull Request #1158 · docker/compose · GitHub
Skip to content
Add extra_hosts to yml configuration --add-hosts - #1158
Merged
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Apr 27, 2015
Merged
Add extra_hosts to yml configuration --add-hosts#1158
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Conversation
@chernjie
@chernjiechernjie
commented
Mar 23, 2015

Copy link


Copy Markdown

@chernjiechernjie
changed the title
Addhosts--add-hostsMar 23, 2015
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
1f61beb to
72f4e02CompareMarch 24, 2015 01:10
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
@tdesvenain@sampwing I have signed your commits after rebasing from the latest master.
@tdesvenain
tdesvenain
commented
Mar 24, 2015

Copy link


Copy Markdown

Great, thanks !
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
I am wondering if it is possible to add an alias to extra_hosts, e.g. hosts
hosts:
- docker: 162.242.195.82
- fig: 50.31.209.229
Thoughts?
@chernjiechernjie
changed the title
--add-hostsAdd extra_hosts to yml configuration --add-hostsMar 24, 2015
@pedrokiefer
pedrokiefer
commented
Mar 27, 2015

Copy link


Copy Markdown

Shouldn't it be possible to add and extra_host that is another container, but not actually linked to the current container.
Something like:
web:
build: .
worker:
build: .
extra_hosts:
- web

@aanand
aanand
commented
Mar 27, 2015

Copy link


Copy Markdown

@pedrokiefer Why not just use a link? You'll get the /etc/hosts entry.
@chernjie
chernjie
commented
Mar 28, 2015

Copy link


Copy Markdown

Author
@pedrokiefer : What @aanand said, use link for containers, use extra_hosts for non-containers
@pedrokiefer
pedrokiefer
commented
Mar 28, 2015

Copy link


Copy Markdown

I had some kind of circular dependency between containers, so I thought extra_hosts would solve that to me.
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
7d0ac5b to
7bf8f3aCompareMarch 28, 2015 19:21
@chernjie
chernjie
commented
Mar 29, 2015

Copy link


Copy Markdown

Author
rebased with CI fixes
@chernjie
chernjieforce-pushed
the
addhosts
branch
10 times, most recently
from
76f5fcb to
b68130aCompareMarch 30, 2015 08:02
@chernjie
chernjie
commented
Mar 30, 2015

Copy link


Copy Markdown

Author
@aanand I would appreciate your feedback/input with this PR. The integration tests are working well. Is there anything that I have missed?
aanand
aanand
reviewed
Mar 30, 2015
 View reviewed changes

Comment threadcompose/service.py
Outdated

@aanandaanandMar 30, 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.

basestring should be six.string_types() for Python 3 compatibility
@chernjie
chernjie
commented
Apr 15, 2015

Copy link


Copy Markdown

Author
Added .sort instead of set, would this work?

cc: @aanand
@chernjie
chernjie
commented
Apr 20, 2015

Copy link


Copy Markdown

Author
@aanand any updates to this PR? Any feedback would be appreciated
@aanand
aanand
commented
Apr 21, 2015

Copy link


Copy Markdown

set(...) is preferable for consistency with other tests.
@sampwing@chernjie
added the extra_hosts option to the yml configuration which exposes t…
fb81c37
…he --add-host flag from the docker client
Signed-off-by: Sam Wing <sampwing@gmail.com>
@chernjie
chernjie
commented
Apr 23, 2015

Copy link


Copy Markdown

Author
@aanand Updated with set(...)
@aanand
aanand
commented
Apr 23, 2015

Copy link


Copy Markdown

Fantastic. Could you squash and rebase? Thanks.
tdesvenainand others
added 2 commits
April 24, 2015 09:21
@tdesvenain@chernjie
Fix when pyyaml has interpreted line as a dictionary
8098b65
Added unit tests in build_extra_hosts + fix
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
Remove extra s from --add-host
25ee3f0
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312)
I think it'd be better to check `if not isinstance(extra_hosts_line,
six.string_types)` and raise an error saying `extra_hosts_config must be
either a list of strings or a string->string mapping`. We shouldn't need
to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
chernjie
commented
Apr 24, 2015

Copy link


Copy Markdown

Author
@aanand I have rebased and squashed all my commits. I have left the other author's contribution as individual commit so as not to lose their contribution information. I hope that's okay
dnephin
dnephin
reviewed
Apr 24, 2015
 View reviewed changes

Comment threadcompose/config.py
@dnephindnephinApr 24, 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.

maybe 'extra_host': 'extra_hosts', as well ?
@chernjiechernjieApr 27, 2015

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

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

Added @ 86a08c0
@dnephin
dnephin
commented
Apr 24, 2015

Copy link


Copy Markdown

I like this, I think it addresses the "external" type described in #988
LGTM
@dnephindnephin
mentioned this pull request
Apr 26, 2015

Closed

@chernjie
Seedocker#1158 (comment)
86a08c0
Signed-off-by: CJ <lim@chernjie.com>
@aanand
aanand
commented
Apr 27, 2015

Copy link


Copy Markdown

LGTM
aanand added a commit
that referenced
this pull request
Apr 27, 2015
@aanand
Merge pull request#1158from chernjie/addhosts
16f8106
Add extra_hosts to yml configuration --add-hosts
@aanand
aanand
merged commit 16f8106
into
docker:masterApr 27, 2015
@aanandaanand
added this to the 1.3.0 milestone
Apr 27, 2015
@aanandaanand
mentioned this pull request
Apr 30, 2015
 Closed

@rysiekpl
rysiekpl
commented
Jun 15, 2015

Copy link


Copy Markdown

Oh this is sweet, and I'm kind of craving this feature right now. Any date set for 1.3.0 release?
@bfirshbfirsh
mentioned this pull request
Jul 6, 2015

Closed

5 tasks
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.3.0

Development

Successfully merging this pull request may close these issues.

8 participants

@chernjie@tdesvenain@pedrokiefer@aanand@dnephin@rysiekpl@GordonTheTurtle@sampwing

, '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('^' + ".*" + '
Add extra_hosts to yml configuration --add-hosts by chernjie · Pull Request #1158 · docker/compose · GitHub
Skip to content
Add extra_hosts to yml configuration --add-hosts - #1158
Merged
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Apr 27, 2015
Merged
Add extra_hosts to yml configuration --add-hosts#1158
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Conversation
@chernjie
@chernjiechernjie
commented
Mar 23, 2015

Copy link


Copy Markdown

@chernjiechernjie
changed the title
Addhosts--add-hostsMar 23, 2015
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
1f61beb to
72f4e02CompareMarch 24, 2015 01:10
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
@tdesvenain@sampwing I have signed your commits after rebasing from the latest master.
@tdesvenain
tdesvenain
commented
Mar 24, 2015

Copy link


Copy Markdown

Great, thanks !
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
I am wondering if it is possible to add an alias to extra_hosts, e.g. hosts
hosts:
- docker: 162.242.195.82
- fig: 50.31.209.229
Thoughts?
@chernjiechernjie
changed the title
--add-hostsAdd extra_hosts to yml configuration --add-hostsMar 24, 2015
@pedrokiefer
pedrokiefer
commented
Mar 27, 2015

Copy link


Copy Markdown

Shouldn't it be possible to add and extra_host that is another container, but not actually linked to the current container.
Something like:
web:
build: .
worker:
build: .
extra_hosts:
- web

@aanand
aanand
commented
Mar 27, 2015

Copy link


Copy Markdown

@pedrokiefer Why not just use a link? You'll get the /etc/hosts entry.
@chernjie
chernjie
commented
Mar 28, 2015

Copy link


Copy Markdown

Author
@pedrokiefer : What @aanand said, use link for containers, use extra_hosts for non-containers
@pedrokiefer
pedrokiefer
commented
Mar 28, 2015

Copy link


Copy Markdown

I had some kind of circular dependency between containers, so I thought extra_hosts would solve that to me.
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
7d0ac5b to
7bf8f3aCompareMarch 28, 2015 19:21
@chernjie
chernjie
commented
Mar 29, 2015

Copy link


Copy Markdown

Author
rebased with CI fixes
@chernjie
chernjieforce-pushed
the
addhosts
branch
10 times, most recently
from
76f5fcb to
b68130aCompareMarch 30, 2015 08:02
@chernjie
chernjie
commented
Mar 30, 2015

Copy link


Copy Markdown

Author
@aanand I would appreciate your feedback/input with this PR. The integration tests are working well. Is there anything that I have missed?
aanand
aanand
reviewed
Mar 30, 2015
 View reviewed changes

Comment threadcompose/service.py
Outdated

@aanandaanandMar 30, 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.

basestring should be six.string_types() for Python 3 compatibility
@chernjie
chernjie
commented
Apr 15, 2015

Copy link


Copy Markdown

Author
Added .sort instead of set, would this work?

cc: @aanand
@chernjie
chernjie
commented
Apr 20, 2015

Copy link


Copy Markdown

Author
@aanand any updates to this PR? Any feedback would be appreciated
@aanand
aanand
commented
Apr 21, 2015

Copy link


Copy Markdown

set(...) is preferable for consistency with other tests.
@sampwing@chernjie
added the extra_hosts option to the yml configuration which exposes t…
fb81c37
…he --add-host flag from the docker client
Signed-off-by: Sam Wing <sampwing@gmail.com>
@chernjie
chernjie
commented
Apr 23, 2015

Copy link


Copy Markdown

Author
@aanand Updated with set(...)
@aanand
aanand
commented
Apr 23, 2015

Copy link


Copy Markdown

Fantastic. Could you squash and rebase? Thanks.
tdesvenainand others
added 2 commits
April 24, 2015 09:21
@tdesvenain@chernjie
Fix when pyyaml has interpreted line as a dictionary
8098b65
Added unit tests in build_extra_hosts + fix
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
Remove extra s from --add-host
25ee3f0
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312)
I think it'd be better to check `if not isinstance(extra_hosts_line,
six.string_types)` and raise an error saying `extra_hosts_config must be
either a list of strings or a string->string mapping`. We shouldn't need
to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
chernjie
commented
Apr 24, 2015

Copy link


Copy Markdown

Author
@aanand I have rebased and squashed all my commits. I have left the other author's contribution as individual commit so as not to lose their contribution information. I hope that's okay
dnephin
dnephin
reviewed
Apr 24, 2015
 View reviewed changes

Comment threadcompose/config.py
@dnephindnephinApr 24, 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.

maybe 'extra_host': 'extra_hosts', as well ?
@chernjiechernjieApr 27, 2015

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

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

Added @ 86a08c0
@dnephin
dnephin
commented
Apr 24, 2015

Copy link


Copy Markdown

I like this, I think it addresses the "external" type described in #988
LGTM
@dnephindnephin
mentioned this pull request
Apr 26, 2015

Closed

@chernjie
Seedocker#1158 (comment)
86a08c0
Signed-off-by: CJ <lim@chernjie.com>
@aanand
aanand
commented
Apr 27, 2015

Copy link


Copy Markdown

LGTM
aanand added a commit
that referenced
this pull request
Apr 27, 2015
@aanand
Merge pull request#1158from chernjie/addhosts
16f8106
Add extra_hosts to yml configuration --add-hosts
@aanand
aanand
merged commit 16f8106
into
docker:masterApr 27, 2015
@aanandaanand
added this to the 1.3.0 milestone
Apr 27, 2015
@aanandaanand
mentioned this pull request
Apr 30, 2015
 Closed

@rysiekpl
rysiekpl
commented
Jun 15, 2015

Copy link


Copy Markdown

Oh this is sweet, and I'm kind of craving this feature right now. Any date set for 1.3.0 release?
@bfirshbfirsh
mentioned this pull request
Jul 6, 2015

Closed

5 tasks
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.3.0

Development

Successfully merging this pull request may close these issues.

8 participants

@chernjie@tdesvenain@pedrokiefer@aanand@dnephin@rysiekpl@GordonTheTurtle@sampwing

, '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('^' + ".*" + '
Add extra_hosts to yml configuration --add-hosts by chernjie · Pull Request #1158 · docker/compose · GitHub
Skip to content
Add extra_hosts to yml configuration --add-hosts - #1158
Merged
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Apr 27, 2015
Merged
Add extra_hosts to yml configuration --add-hosts#1158
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Conversation
@chernjie
@chernjiechernjie
commented
Mar 23, 2015

Copy link


Copy Markdown

@chernjiechernjie
changed the title
Addhosts--add-hostsMar 23, 2015
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
1f61beb to
72f4e02CompareMarch 24, 2015 01:10
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
@tdesvenain@sampwing I have signed your commits after rebasing from the latest master.
@tdesvenain
tdesvenain
commented
Mar 24, 2015

Copy link


Copy Markdown

Great, thanks !
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
I am wondering if it is possible to add an alias to extra_hosts, e.g. hosts
hosts:
- docker: 162.242.195.82
- fig: 50.31.209.229
Thoughts?
@chernjiechernjie
changed the title
--add-hostsAdd extra_hosts to yml configuration --add-hostsMar 24, 2015
@pedrokiefer
pedrokiefer
commented
Mar 27, 2015

Copy link


Copy Markdown

Shouldn't it be possible to add and extra_host that is another container, but not actually linked to the current container.
Something like:
web:
build: .
worker:
build: .
extra_hosts:
- web

@aanand
aanand
commented
Mar 27, 2015

Copy link


Copy Markdown

@pedrokiefer Why not just use a link? You'll get the /etc/hosts entry.
@chernjie
chernjie
commented
Mar 28, 2015

Copy link


Copy Markdown

Author
@pedrokiefer : What @aanand said, use link for containers, use extra_hosts for non-containers
@pedrokiefer
pedrokiefer
commented
Mar 28, 2015

Copy link


Copy Markdown

I had some kind of circular dependency between containers, so I thought extra_hosts would solve that to me.
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
7d0ac5b to
7bf8f3aCompareMarch 28, 2015 19:21
@chernjie
chernjie
commented
Mar 29, 2015

Copy link


Copy Markdown

Author
rebased with CI fixes
@chernjie
chernjieforce-pushed
the
addhosts
branch
10 times, most recently
from
76f5fcb to
b68130aCompareMarch 30, 2015 08:02
@chernjie
chernjie
commented
Mar 30, 2015

Copy link


Copy Markdown

Author
@aanand I would appreciate your feedback/input with this PR. The integration tests are working well. Is there anything that I have missed?
aanand
aanand
reviewed
Mar 30, 2015
 View reviewed changes

Comment threadcompose/service.py
Outdated

@aanandaanandMar 30, 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.

basestring should be six.string_types() for Python 3 compatibility
@chernjie
chernjie
commented
Apr 15, 2015

Copy link


Copy Markdown

Author
Added .sort instead of set, would this work?

cc: @aanand
@chernjie
chernjie
commented
Apr 20, 2015

Copy link


Copy Markdown

Author
@aanand any updates to this PR? Any feedback would be appreciated
@aanand
aanand
commented
Apr 21, 2015

Copy link


Copy Markdown

set(...) is preferable for consistency with other tests.
@sampwing@chernjie
added the extra_hosts option to the yml configuration which exposes t…
fb81c37
…he --add-host flag from the docker client
Signed-off-by: Sam Wing <sampwing@gmail.com>
@chernjie
chernjie
commented
Apr 23, 2015

Copy link


Copy Markdown

Author
@aanand Updated with set(...)
@aanand
aanand
commented
Apr 23, 2015

Copy link


Copy Markdown

Fantastic. Could you squash and rebase? Thanks.
tdesvenainand others
added 2 commits
April 24, 2015 09:21
@tdesvenain@chernjie
Fix when pyyaml has interpreted line as a dictionary
8098b65
Added unit tests in build_extra_hosts + fix
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
Remove extra s from --add-host
25ee3f0
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312)
I think it'd be better to check `if not isinstance(extra_hosts_line,
six.string_types)` and raise an error saying `extra_hosts_config must be
either a list of strings or a string->string mapping`. We shouldn't need
to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
chernjie
commented
Apr 24, 2015

Copy link


Copy Markdown

Author
@aanand I have rebased and squashed all my commits. I have left the other author's contribution as individual commit so as not to lose their contribution information. I hope that's okay
dnephin
dnephin
reviewed
Apr 24, 2015
 View reviewed changes

Comment threadcompose/config.py
@dnephindnephinApr 24, 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.

maybe 'extra_host': 'extra_hosts', as well ?
@chernjiechernjieApr 27, 2015

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

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

Added @ 86a08c0
@dnephin
dnephin
commented
Apr 24, 2015

Copy link


Copy Markdown

I like this, I think it addresses the "external" type described in #988
LGTM
@dnephindnephin
mentioned this pull request
Apr 26, 2015

Closed

@chernjie
Seedocker#1158 (comment)
86a08c0
Signed-off-by: CJ <lim@chernjie.com>
@aanand
aanand
commented
Apr 27, 2015

Copy link


Copy Markdown

LGTM
aanand added a commit
that referenced
this pull request
Apr 27, 2015
@aanand
Merge pull request#1158from chernjie/addhosts
16f8106
Add extra_hosts to yml configuration --add-hosts
@aanand
aanand
merged commit 16f8106
into
docker:masterApr 27, 2015
@aanandaanand
added this to the 1.3.0 milestone
Apr 27, 2015
@aanandaanand
mentioned this pull request
Apr 30, 2015
 Closed

@rysiekpl
rysiekpl
commented
Jun 15, 2015

Copy link


Copy Markdown

Oh this is sweet, and I'm kind of craving this feature right now. Any date set for 1.3.0 release?
@bfirshbfirsh
mentioned this pull request
Jul 6, 2015

Closed

5 tasks
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.3.0

Development

Successfully merging this pull request may close these issues.

8 participants

@chernjie@tdesvenain@pedrokiefer@aanand@dnephin@rysiekpl@GordonTheTurtle@sampwing

, '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" + '
Add extra_hosts to yml configuration --add-hosts by chernjie · Pull Request #1158 · docker/compose · GitHub
Skip to content
Add extra_hosts to yml configuration --add-hosts - #1158
Merged
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Apr 27, 2015
Merged
Add extra_hosts to yml configuration --add-hosts#1158
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Conversation
@chernjie
@chernjiechernjie
commented
Mar 23, 2015

Copy link


Copy Markdown

@chernjiechernjie
changed the title
Addhosts--add-hostsMar 23, 2015
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
1f61beb to
72f4e02CompareMarch 24, 2015 01:10
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
@tdesvenain@sampwing I have signed your commits after rebasing from the latest master.
@tdesvenain
tdesvenain
commented
Mar 24, 2015

Copy link


Copy Markdown

Great, thanks !
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
I am wondering if it is possible to add an alias to extra_hosts, e.g. hosts
hosts:
- docker: 162.242.195.82
- fig: 50.31.209.229
Thoughts?
@chernjiechernjie
changed the title
--add-hostsAdd extra_hosts to yml configuration --add-hostsMar 24, 2015
@pedrokiefer
pedrokiefer
commented
Mar 27, 2015

Copy link


Copy Markdown

Shouldn't it be possible to add and extra_host that is another container, but not actually linked to the current container.
Something like:
web:
build: .
worker:
build: .
extra_hosts:
- web

@aanand
aanand
commented
Mar 27, 2015

Copy link


Copy Markdown

@pedrokiefer Why not just use a link? You'll get the /etc/hosts entry.
@chernjie
chernjie
commented
Mar 28, 2015

Copy link


Copy Markdown

Author
@pedrokiefer : What @aanand said, use link for containers, use extra_hosts for non-containers
@pedrokiefer
pedrokiefer
commented
Mar 28, 2015

Copy link


Copy Markdown

I had some kind of circular dependency between containers, so I thought extra_hosts would solve that to me.
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
7d0ac5b to
7bf8f3aCompareMarch 28, 2015 19:21
@chernjie
chernjie
commented
Mar 29, 2015

Copy link


Copy Markdown

Author
rebased with CI fixes
@chernjie
chernjieforce-pushed
the
addhosts
branch
10 times, most recently
from
76f5fcb to
b68130aCompareMarch 30, 2015 08:02
@chernjie
chernjie
commented
Mar 30, 2015

Copy link


Copy Markdown

Author
@aanand I would appreciate your feedback/input with this PR. The integration tests are working well. Is there anything that I have missed?
aanand
aanand
reviewed
Mar 30, 2015
 View reviewed changes

Comment threadcompose/service.py
Outdated

@aanandaanandMar 30, 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.

basestring should be six.string_types() for Python 3 compatibility
@chernjie
chernjie
commented
Apr 15, 2015

Copy link


Copy Markdown

Author
Added .sort instead of set, would this work?

cc: @aanand
@chernjie
chernjie
commented
Apr 20, 2015

Copy link


Copy Markdown

Author
@aanand any updates to this PR? Any feedback would be appreciated
@aanand
aanand
commented
Apr 21, 2015

Copy link


Copy Markdown

set(...) is preferable for consistency with other tests.
@sampwing@chernjie
added the extra_hosts option to the yml configuration which exposes t…
fb81c37
…he --add-host flag from the docker client
Signed-off-by: Sam Wing <sampwing@gmail.com>
@chernjie
chernjie
commented
Apr 23, 2015

Copy link


Copy Markdown

Author
@aanand Updated with set(...)
@aanand
aanand
commented
Apr 23, 2015

Copy link


Copy Markdown

Fantastic. Could you squash and rebase? Thanks.
tdesvenainand others
added 2 commits
April 24, 2015 09:21
@tdesvenain@chernjie
Fix when pyyaml has interpreted line as a dictionary
8098b65
Added unit tests in build_extra_hosts + fix
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
Remove extra s from --add-host
25ee3f0
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312)
I think it'd be better to check `if not isinstance(extra_hosts_line,
six.string_types)` and raise an error saying `extra_hosts_config must be
either a list of strings or a string->string mapping`. We shouldn't need
to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
chernjie
commented
Apr 24, 2015

Copy link


Copy Markdown

Author
@aanand I have rebased and squashed all my commits. I have left the other author's contribution as individual commit so as not to lose their contribution information. I hope that's okay
dnephin
dnephin
reviewed
Apr 24, 2015
 View reviewed changes

Comment threadcompose/config.py
@dnephindnephinApr 24, 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.

maybe 'extra_host': 'extra_hosts', as well ?
@chernjiechernjieApr 27, 2015

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

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

Added @ 86a08c0
@dnephin
dnephin
commented
Apr 24, 2015

Copy link


Copy Markdown

I like this, I think it addresses the "external" type described in #988
LGTM
@dnephindnephin
mentioned this pull request
Apr 26, 2015

Closed

@chernjie
Seedocker#1158 (comment)
86a08c0
Signed-off-by: CJ <lim@chernjie.com>
@aanand
aanand
commented
Apr 27, 2015

Copy link


Copy Markdown

LGTM
aanand added a commit
that referenced
this pull request
Apr 27, 2015
@aanand
Merge pull request#1158from chernjie/addhosts
16f8106
Add extra_hosts to yml configuration --add-hosts
@aanand
aanand
merged commit 16f8106
into
docker:masterApr 27, 2015
@aanandaanand
added this to the 1.3.0 milestone
Apr 27, 2015
@aanandaanand
mentioned this pull request
Apr 30, 2015
 Closed

@rysiekpl
rysiekpl
commented
Jun 15, 2015

Copy link


Copy Markdown

Oh this is sweet, and I'm kind of craving this feature right now. Any date set for 1.3.0 release?
@bfirshbfirsh
mentioned this pull request
Jul 6, 2015

Closed

5 tasks
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.3.0

Development

Successfully merging this pull request may close these issues.

8 participants

@chernjie@tdesvenain@pedrokiefer@aanand@dnephin@rysiekpl@GordonTheTurtle@sampwing

, '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('^' + ".*" + '
Add extra_hosts to yml configuration --add-hosts by chernjie · Pull Request #1158 · docker/compose · GitHub
Skip to content
Add extra_hosts to yml configuration --add-hosts - #1158
Merged
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Apr 27, 2015
Merged
Add extra_hosts to yml configuration --add-hosts#1158
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Conversation
@chernjie
@chernjiechernjie
commented
Mar 23, 2015

Copy link


Copy Markdown

@chernjiechernjie
changed the title
Addhosts--add-hostsMar 23, 2015
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
1f61beb to
72f4e02CompareMarch 24, 2015 01:10
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
@tdesvenain@sampwing I have signed your commits after rebasing from the latest master.
@tdesvenain
tdesvenain
commented
Mar 24, 2015

Copy link


Copy Markdown

Great, thanks !
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
I am wondering if it is possible to add an alias to extra_hosts, e.g. hosts
hosts:
- docker: 162.242.195.82
- fig: 50.31.209.229
Thoughts?
@chernjiechernjie
changed the title
--add-hostsAdd extra_hosts to yml configuration --add-hostsMar 24, 2015
@pedrokiefer
pedrokiefer
commented
Mar 27, 2015

Copy link


Copy Markdown

Shouldn't it be possible to add and extra_host that is another container, but not actually linked to the current container.
Something like:
web:
build: .
worker:
build: .
extra_hosts:
- web

@aanand
aanand
commented
Mar 27, 2015

Copy link


Copy Markdown

@pedrokiefer Why not just use a link? You'll get the /etc/hosts entry.
@chernjie
chernjie
commented
Mar 28, 2015

Copy link


Copy Markdown

Author
@pedrokiefer : What @aanand said, use link for containers, use extra_hosts for non-containers
@pedrokiefer
pedrokiefer
commented
Mar 28, 2015

Copy link


Copy Markdown

I had some kind of circular dependency between containers, so I thought extra_hosts would solve that to me.
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
7d0ac5b to
7bf8f3aCompareMarch 28, 2015 19:21
@chernjie
chernjie
commented
Mar 29, 2015

Copy link


Copy Markdown

Author
rebased with CI fixes
@chernjie
chernjieforce-pushed
the
addhosts
branch
10 times, most recently
from
76f5fcb to
b68130aCompareMarch 30, 2015 08:02
@chernjie
chernjie
commented
Mar 30, 2015

Copy link


Copy Markdown

Author
@aanand I would appreciate your feedback/input with this PR. The integration tests are working well. Is there anything that I have missed?
aanand
aanand
reviewed
Mar 30, 2015
 View reviewed changes

Comment threadcompose/service.py
Outdated

@aanandaanandMar 30, 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.

basestring should be six.string_types() for Python 3 compatibility
@chernjie
chernjie
commented
Apr 15, 2015

Copy link


Copy Markdown

Author
Added .sort instead of set, would this work?

cc: @aanand
@chernjie
chernjie
commented
Apr 20, 2015

Copy link


Copy Markdown

Author
@aanand any updates to this PR? Any feedback would be appreciated
@aanand
aanand
commented
Apr 21, 2015

Copy link


Copy Markdown

set(...) is preferable for consistency with other tests.
@sampwing@chernjie
added the extra_hosts option to the yml configuration which exposes t…
fb81c37
…he --add-host flag from the docker client
Signed-off-by: Sam Wing <sampwing@gmail.com>
@chernjie
chernjie
commented
Apr 23, 2015

Copy link


Copy Markdown

Author
@aanand Updated with set(...)
@aanand
aanand
commented
Apr 23, 2015

Copy link


Copy Markdown

Fantastic. Could you squash and rebase? Thanks.
tdesvenainand others
added 2 commits
April 24, 2015 09:21
@tdesvenain@chernjie
Fix when pyyaml has interpreted line as a dictionary
8098b65
Added unit tests in build_extra_hosts + fix
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
Remove extra s from --add-host
25ee3f0
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312)
I think it'd be better to check `if not isinstance(extra_hosts_line,
six.string_types)` and raise an error saying `extra_hosts_config must be
either a list of strings or a string->string mapping`. We shouldn't need
to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
chernjie
commented
Apr 24, 2015

Copy link


Copy Markdown

Author
@aanand I have rebased and squashed all my commits. I have left the other author's contribution as individual commit so as not to lose their contribution information. I hope that's okay
dnephin
dnephin
reviewed
Apr 24, 2015
 View reviewed changes

Comment threadcompose/config.py
@dnephindnephinApr 24, 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.

maybe 'extra_host': 'extra_hosts', as well ?
@chernjiechernjieApr 27, 2015

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

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

Added @ 86a08c0
@dnephin
dnephin
commented
Apr 24, 2015

Copy link


Copy Markdown

I like this, I think it addresses the "external" type described in #988
LGTM
@dnephindnephin
mentioned this pull request
Apr 26, 2015

Closed

@chernjie
Seedocker#1158 (comment)
86a08c0
Signed-off-by: CJ <lim@chernjie.com>
@aanand
aanand
commented
Apr 27, 2015

Copy link


Copy Markdown

LGTM
aanand added a commit
that referenced
this pull request
Apr 27, 2015
@aanand
Merge pull request#1158from chernjie/addhosts
16f8106
Add extra_hosts to yml configuration --add-hosts
@aanand
aanand
merged commit 16f8106
into
docker:masterApr 27, 2015
@aanandaanand
added this to the 1.3.0 milestone
Apr 27, 2015
@aanandaanand
mentioned this pull request
Apr 30, 2015
 Closed

@rysiekpl
rysiekpl
commented
Jun 15, 2015

Copy link


Copy Markdown

Oh this is sweet, and I'm kind of craving this feature right now. Any date set for 1.3.0 release?
@bfirshbfirsh
mentioned this pull request
Jul 6, 2015

Closed

5 tasks
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.3.0

Development

Successfully merging this pull request may close these issues.

8 participants

@chernjie@tdesvenain@pedrokiefer@aanand@dnephin@rysiekpl@GordonTheTurtle@sampwing

, '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); }
})();
})();
Add extra_hosts to yml configuration --add-hosts by chernjie · Pull Request #1158 · docker/compose · GitHub
Skip to content
Add extra_hosts to yml configuration --add-hosts - #1158
Merged
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Apr 27, 2015
Merged
Add extra_hosts to yml configuration --add-hosts#1158
aanand merged 4 commits into
docker:masterfrom 
chernjie:addhosts
Conversation
@chernjie
@chernjiechernjie
commented
Mar 23, 2015

Copy link


Copy Markdown

@chernjiechernjie
changed the title
Addhosts--add-hostsMar 23, 2015
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
1f61beb to
72f4e02CompareMarch 24, 2015 01:10
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
@tdesvenain@sampwing I have signed your commits after rebasing from the latest master.
@tdesvenain
tdesvenain
commented
Mar 24, 2015

Copy link


Copy Markdown

Great, thanks !
@chernjie
chernjie
commented
Mar 24, 2015

Copy link


Copy Markdown

Author
I am wondering if it is possible to add an alias to extra_hosts, e.g. hosts
hosts:
- docker: 162.242.195.82
- fig: 50.31.209.229
Thoughts?
@chernjiechernjie
changed the title
--add-hostsAdd extra_hosts to yml configuration --add-hostsMar 24, 2015
@pedrokiefer
pedrokiefer
commented
Mar 27, 2015

Copy link


Copy Markdown

Shouldn't it be possible to add and extra_host that is another container, but not actually linked to the current container.
Something like:
web:
build: .
worker:
build: .
extra_hosts:
- web

@aanand
aanand
commented
Mar 27, 2015

Copy link


Copy Markdown

@pedrokiefer Why not just use a link? You'll get the /etc/hosts entry.
@chernjie
chernjie
commented
Mar 28, 2015

Copy link


Copy Markdown

Author
@pedrokiefer : What @aanand said, use link for containers, use extra_hosts for non-containers
@pedrokiefer
pedrokiefer
commented
Mar 28, 2015

Copy link


Copy Markdown

I had some kind of circular dependency between containers, so I thought extra_hosts would solve that to me.
@chernjie
chernjieforce-pushed
the
addhosts
branch
3 times, most recently
from
7d0ac5b to
7bf8f3aCompareMarch 28, 2015 19:21
@chernjie
chernjie
commented
Mar 29, 2015

Copy link


Copy Markdown

Author
rebased with CI fixes
@chernjie
chernjieforce-pushed
the
addhosts
branch
10 times, most recently
from
76f5fcb to
b68130aCompareMarch 30, 2015 08:02
@chernjie
chernjie
commented
Mar 30, 2015

Copy link


Copy Markdown

Author
@aanand I would appreciate your feedback/input with this PR. The integration tests are working well. Is there anything that I have missed?
aanand
aanand
reviewed
Mar 30, 2015
 View reviewed changes

Comment threadcompose/service.py
Outdated

@aanandaanandMar 30, 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.

basestring should be six.string_types() for Python 3 compatibility
@chernjie
chernjie
commented
Apr 15, 2015

Copy link


Copy Markdown

Author
Added .sort instead of set, would this work?

cc: @aanand
@chernjie
chernjie
commented
Apr 20, 2015

Copy link


Copy Markdown

Author
@aanand any updates to this PR? Any feedback would be appreciated
@aanand
aanand
commented
Apr 21, 2015

Copy link


Copy Markdown

set(...) is preferable for consistency with other tests.
@sampwing@chernjie
added the extra_hosts option to the yml configuration which exposes t…
fb81c37
…he --add-host flag from the docker client
Signed-off-by: Sam Wing <sampwing@gmail.com>
@chernjie
chernjie
commented
Apr 23, 2015

Copy link


Copy Markdown

Author
@aanand Updated with set(...)
@aanand
aanand
commented
Apr 23, 2015

Copy link


Copy Markdown

Fantastic. Could you squash and rebase? Thanks.
tdesvenainand others
added 2 commits
April 24, 2015 09:21
@tdesvenain@chernjie
Fix when pyyaml has interpreted line as a dictionary
8098b65
Added unit tests in build_extra_hosts + fix
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
Remove extra s from --add-host
25ee3f0
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312)
I think it'd be better to check `if not isinstance(extra_hosts_line,
six.string_types)` and raise an error saying `extra_hosts_config must be
either a list of strings or a string->string mapping`. We shouldn't need
to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()
Signed-off-by: CJ <lim@chernjie.com>
@chernjie
chernjie
commented
Apr 24, 2015

Copy link


Copy Markdown

Author
@aanand I have rebased and squashed all my commits. I have left the other author's contribution as individual commit so as not to lose their contribution information. I hope that's okay
dnephin
dnephin
reviewed
Apr 24, 2015
 View reviewed changes

Comment threadcompose/config.py
@dnephindnephinApr 24, 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.

maybe 'extra_host': 'extra_hosts', as well ?
@chernjiechernjieApr 27, 2015

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

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

Added @ 86a08c0
@dnephin
dnephin
commented
Apr 24, 2015

Copy link


Copy Markdown

I like this, I think it addresses the "external" type described in #988
LGTM
@dnephindnephin
mentioned this pull request
Apr 26, 2015

Closed

@chernjie
Seedocker#1158 (comment)
86a08c0
Signed-off-by: CJ <lim@chernjie.com>
@aanand
aanand
commented
Apr 27, 2015

Copy link


Copy Markdown

LGTM
aanand added a commit
that referenced
this pull request
Apr 27, 2015
@aanand
Merge pull request#1158from chernjie/addhosts
16f8106
Add extra_hosts to yml configuration --add-hosts
@aanand
aanand
merged commit 16f8106
into
docker:masterApr 27, 2015
@aanandaanand
added this to the 1.3.0 milestone
Apr 27, 2015
@aanandaanand
mentioned this pull request
Apr 30, 2015
 Closed

@rysiekpl
rysiekpl
commented
Jun 15, 2015

Copy link


Copy Markdown

Oh this is sweet, and I'm kind of craving this feature right now. Any date set for 1.3.0 release?
@bfirshbfirsh
mentioned this pull request
Jul 6, 2015

Closed

5 tasks
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.3.0

Development

Successfully merging this pull request may close these issues.

8 participants

@chernjie@tdesvenain@pedrokiefer@aanand@dnephin@rysiekpl@GordonTheTurtle@sampwing