Skip to content

Adding extra_hosts param to docker-compose#958

Closed
immortal-tofu wants to merge 1 commit intodocker:masterfrom
immortal-tofu:master
Closed

Adding extra_hosts param to docker-compose#958
immortal-tofu wants to merge 1 commit intodocker:masterfrom
immortal-tofu:master

Conversation

@immortal-tofu
Copy link

@immortal-tofu immortal-tofu commented Feb 12, 2015

Adding extra_hosts parameter with doc and tests

dnephin
dnephin reviewed Feb 12, 2015
View reviewed changes
compose/service.py Outdated
Copy link

@dnephin dnephin Feb 12, 2015

Choose a reason for hiding this comment

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

Please keep this list sorted alphabetically (same with the list below)

@dnephin
Copy link

dnephin commented Feb 12, 2015

rebase with master to pickup the fix for those test failures, otherwise looks good

@immortal-tofu
Copy link
Author

immortal-tofu commented Feb 12, 2015

Rebase done

@immortal-tofu
Copy link
Author

immortal-tofu commented Feb 12, 2015

Fixed alphabetical order too

@aanand
Copy link

aanand commented Feb 13, 2015

Test appears to be failing:

FAIL: test_create_container_with_extra_hosts (tests.integration.service_test.ServiceTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/code/tests/integration/service_test.py", line 144, in test_create_container_with_extra_hosts
    ['myserver:192.168.2.90', 'myserver2:10.55.32.12'])
AssertionError: None != [u'myserver:192.168.2.90', u'myserver2:10.55.32.12']

@dnephin
Copy link

dnephin commented Feb 14, 2015

I think this feature requires docker 1.3 (http://docs.docker.com/v1.3/release-notes/), and if I remember correctly wercker is running docker 1.2, so I think this is blocking on #886 as well

@dnephin dnephin mentioned this pull request Feb 14, 2015
Closed
@chernjie chernjie mentioned this pull request Mar 25, 2015
Merged
Adding extra_hosts parameter
b325cd7 
Signed-off-by: Clément Danjou <[email protected]>
@immortal-tofu
Copy link
Author

immortal-tofu commented May 13, 2015

Closed since this feature exists now in docker-compose.

Sign up for free to 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.

3 participants

@immortal-tofu @dnephin @aanand