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

chernjie · 2015-03-23T17:31:24Z

Add extra_hosts to yml configuration

Followup from:

Example:

extra_hosts:
 - "docker:162.242.195.82"
 - "fig:50.31.209.229"

Signed-off-by: CJ lim@chernjie.com

chernjie · 2015-03-24T01:18:30Z

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

tdesvenain · 2015-03-24T08:44:34Z

Great, thanks !

chernjie · 2015-03-24T10:23:45Z

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?

pedrokiefer · 2015-03-27T18:51:53Z

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 · 2015-03-27T23:28:51Z

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

chernjie · 2015-03-28T18:03:59Z

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

pedrokiefer · 2015-03-28T18:13:46Z

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

chernjie · 2015-03-29T05:25:55Z

rebased with CI fixes

chernjie · 2015-03-30T10:19:58Z

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

aanand · 2015-03-30T20:02:46Z

compose/service.py

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

chernjie · 2015-04-15T12:20:43Z

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

chernjie · 2015-04-20T10:45:56Z

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

aanand · 2015-04-21T11:18:52Z

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

…he --add-host flag from the docker client Signed-off-by: Sam Wing <sampwing@gmail.com>

chernjie · 2015-04-23T14:36:44Z

@aanand Updated with set(...)

aanand · 2015-04-23T15:33:51Z

Fantastic. Could you squash and rebase? Thanks.

Added unit tests in build_extra_hosts + fix Signed-off-by: CJ <lim@chernjie.com>

@aanand

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 · 2015-04-24T01:25:46Z

@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 · 2015-04-24T16:28:37Z

compose/config.py

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

Added @ 86a08c0

dnephin · 2015-04-24T16:36:38Z

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

LGTM

Signed-off-by: CJ <lim@chernjie.com>

aanand · 2015-04-27T11:26:27Z

LGTM

Add extra_hosts to yml configuration --add-hosts

rysiekpl · 2015-06-15T17:54:07Z

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

chernjie changed the title ~~Addhosts~~ --add-hosts Mar 23, 2015

chernjie force-pushed the addhosts branch 3 times, most recently from 1f61beb to 72f4e02 Compare March 24, 2015 01:10

chernjie force-pushed the addhosts branch from 7fbb715 to 97a9607 Compare March 24, 2015 10:29

chernjie changed the title ~~--add-hosts~~ Add extra_hosts to yml configuration --add-hosts Mar 24, 2015

chernjie force-pushed the addhosts branch from f208832 to 97a9607 Compare March 28, 2015 18:04

chernjie force-pushed the addhosts branch 3 times, most recently from 7d0ac5b to 7bf8f3a Compare March 28, 2015 19:21

chernjie force-pushed the addhosts branch 10 times, most recently from 76f5fcb to b68130a Compare March 30, 2015 08:02

aanand reviewed Mar 30, 2015
View reviewed changes

compose/service.py Outdated

Copy link

aanand Mar 30, 2015

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

GordonTheTurtle added dco/yes and removed dco/no labels Apr 15, 2015

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 force-pushed the addhosts branch from 762e54f to 7609373 Compare April 23, 2015 13:55

GordonTheTurtle added dco/no and removed dco/no labels Apr 23, 2015

chernjie force-pushed the addhosts branch from 96add9a to 43e2058 Compare April 23, 2015 14:06

GordonTheTurtle removed the dco/no label Apr 23, 2015

tdesvenain and others added 2 commits April 24, 2015 09:21

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 force-pushed the addhosts branch from 43e2058 to 25ee3f0 Compare April 24, 2015 01:21

GordonTheTurtle removed the dco/no label Apr 24, 2015

dnephin reviewed Apr 24, 2015
View reviewed changes

dnephin mentioned this pull request Apr 26, 2015

Link to a service which isn't a Docker container #1110

Closed

See docker#1158 (comment)

86a08c0

Signed-off-by: CJ <lim@chernjie.com>

aanand added a commit that referenced this pull request Apr 27, 2015

Merge pull request #1158 from chernjie/addhosts

16f8106

Add extra_hosts to yml configuration --add-hosts

aanand merged commit 16f8106 into docker:master Apr 27, 2015

aanand added this to the 1.3.0 milestone Apr 27, 2015

aanand mentioned this pull request Apr 30, 2015

Add support for docker's client's --add-host command #848

Closed

bfirsh mentioned this pull request Jul 6, 2015

docker-compose.yml should support every docker run option #754

Closed

5 tasks

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

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

Uh oh!

Conversation

chernjie commented Mar 23, 2015

Example:

Uh oh!

chernjie commented Mar 24, 2015

Uh oh!

tdesvenain commented Mar 24, 2015

Uh oh!

chernjie commented Mar 24, 2015

Uh oh!

pedrokiefer commented Mar 27, 2015

Uh oh!

aanand commented Mar 27, 2015

Uh oh!

chernjie commented Mar 28, 2015

Uh oh!

pedrokiefer commented Mar 28, 2015

Uh oh!

chernjie commented Mar 29, 2015

Uh oh!

chernjie commented Mar 30, 2015

Uh oh!

aanand Mar 30, 2015

Choose a reason for hiding this comment

Uh oh!

chernjie commented Apr 15, 2015

Uh oh!

chernjie commented Apr 20, 2015

Uh oh!

aanand commented Apr 21, 2015

Uh oh!

chernjie commented Apr 23, 2015

Uh oh!

aanand commented Apr 23, 2015

Uh oh!

chernjie commented Apr 24, 2015

Uh oh!

dnephin Apr 24, 2015

Choose a reason for hiding this comment

Uh oh!

chernjie Apr 27, 2015

Choose a reason for hiding this comment

Uh oh!

dnephin commented Apr 24, 2015

Uh oh!

aanand commented Apr 27, 2015

Uh oh!

rysiekpl commented Jun 15, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants