Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sampwing wants to merge 6 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bfa7d45
upgraded docker-py from 0.6.0 to 0.7.1
sampwing Jan 15, 2015
f3999c6
added the extra_hosts option to the yml configuration which exposes t…
sampwing Jan 15, 2015
c33d131
Fix when pyyaml has interpreted line as a dictionary
tdesvenain Jan 21, 2015
c0abe43
Merge pull request #1 from tdesvenain/master
sampwing Jan 27, 2015
3e6c7cd
Added unit tests in build_extra_hosts + fix
tdesvenain Feb 25, 2015
d88d668
Merge pull request #2 from tdesvenain/master
sampwing Feb 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions docs/yml.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,23 @@ external_links:
- project_db_1:postgresql
```

### extra_hosts

Add hostname mappings. Use the same values as the docker client `--add-hosts` parameter.

```
extra_hosts:
- docker: 162.242.195.82
- fig: 50.31.209.229
```

An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:

```
162.242.195.82 docker
50.31.209.229 fig
```

### ports

Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container port (a random host port will be chosen).
Expand Down
27 changes: 26 additions & 1 deletion fig/service.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
'entrypoint',
'env_file',
'environment',
'extra_hosts',
'hostname',
'image',
'mem_limit',
Expand All@@ -43,6 +44,7 @@
]
DOCKER_CONFIG_HINTS = {
'cpu_share' : 'cpu_shares',
'add_host' : 'extra_hosts',
'link' : 'links',
'port' : 'ports',
'privilege' : 'privileged',
Expand All@@ -58,6 +60,7 @@
'dns',
'dns_search',
'env_file',
'extra_hosts',
'net',
'privileged',
'restart',
Expand DownExpand Up@@ -97,7 +100,6 @@ def __init__(self, name, client=None, project='default', links=None, external_li

supported_options = DOCKER_CONFIG_KEYS + ['build', 'expose',
'external_links']

for k in options:
if k not in supported_options:
msg = "Unsupported config option for %s service: '%s'" % (name, k)
Expand DownExpand Up@@ -322,6 +324,8 @@ def start_container(self, container, intermediate_container=None, **override_opt

restart = parse_restart_spec(options.get('restart', None))

extra_hosts = build_extra_hosts(options.get('extra_hosts', None))

container.start(
links=self._get_links(link_to_self=options.get('one_off', False)),
port_bindings=port_bindings,
Expand All@@ -334,6 +338,7 @@ def start_container(self, container, intermediate_container=None, **override_opt
restart_policy=restart,
cap_add=cap_add,
cap_drop=cap_drop,
extra_hosts=extra_hosts,
)
return container

Expand DownExpand Up@@ -629,6 +634,26 @@ def split_port(port):
return internal_port, (external_ip, external_port or None)


def build_extra_hosts(extra_hosts_config):
if extra_hosts_config is None:
return None

if isinstance(extra_hosts_config, basestring):
extra_hosts_config = [extra_hosts_config]

extra_hosts_dict = {}
for extra_hosts_line in extra_hosts_config:
if isinstance(extra_hosts_line, dict):
# already interpreted as a dict (depends on pyyaml version)
extra_hosts_dict.update(extra_hosts_line)
else:
# not already interpreted as a dict
host, ip = extra_hosts_line.split(':')
extra_hosts_dict.update({host.strip(): ip.strip()})

return extra_hosts_dict


def merge_environment(options):
env = {}

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==0.6.0
docker-py==0.7.1
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ def find_version(*file_paths):
'requests >= 2.2.1, < 3',
'texttable >= 0.8.1, < 0.9',
'websocket-client >= 0.11.0, < 0.12',
'docker-py >= 0.6.0, < 0.7',
'docker-py >= 0.7.1, < 0.8',
'dockerpty >= 0.3.2, < 0.4',
'six >= 1.3.0, < 2',
]
Expand Down
37 changes: 37 additions & 0 deletions tests/integration/service_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

from fig import Service
from fig.service import CannotBeScaledError
from fig.service import build_extra_hosts
from fig.container import Container
from docker.errors import APIError
from .testcases import DockerClientTestCase
Expand DownExpand Up@@ -106,6 +107,42 @@ def test_create_container_with_cpu_shares(self):
service.start_container(container)
self.assertEqual(container.inspect()['Config']['CpuShares'], 73)

def test_build_extra_hosts(self):
# string
self.assertEqual(build_extra_hosts("www.example.com: 192.168.0.17"),
{'www.example.com': '192.168.0.17'})

# list of strings
self.assertEqual(build_extra_hosts(
["www.example.com: 192.168.0.17"]),
{'www.example.com': '192.168.0.17'})
self.assertEqual(build_extra_hosts(
["www.example.com: 192.168.0.17",
"api.example.com: 192.168.0.18"]),
{'www.example.com': '192.168.0.17',
'api.example.com': '192.168.0.18'})
# list of dictionaries
self.assertEqual(build_extra_hosts(
[{'www.example.com': '192.168.0.17'},
{'api.example.com': '192.168.0.18'}
]),
{'www.example.com': '192.168.0.17',
'api.example.com': '192.168.0.18'})

def test_create_container_with_extra_hosts_list(self):
extra_hosts = ['docker:162.242.195.82', 'fig:50.31.209.229']
service = self.create_service('db', extra_hosts=extra_hosts)
container = service.create_container()
service.start_container(container)
self.assertEqual(container.get('HostConfig.ExtraHosts'), extra_hosts)

def test_create_container_with_extra_hosts_string(self):
extra_hosts = 'docker:162.242.195.82'
service = self.create_service('db', extra_hosts=extra_hosts)
container = service.create_container()
service.start_container(container)
self.assertEqual(container.get('HostConfig.ExtraHosts'), [extra_hosts])

def test_create_container_with_specified_volume(self):
host_path = '/tmp/host-path'
container_path = '/container-path'
Expand Down
, '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 support for docker's client's --add-host command by sampwing · Pull Request #848 · docker/compose · GitHub
Skip to content
Add support for docker's client's --add-host command#848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sampwing
wants to merge
6
commits into

from

 Closed


Add support for docker's client's --add-host command
#848
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
bfa7d45

upgraded docker-py from 0.6.0 to 0.7.1


sampwing Jan 15, 2015
f3999c6

added the extra_hosts option to the yml configuration which exposes t…


sampwing Jan 15, 2015
c33d131

Fix when pyyaml has interpreted line as a dictionary


tdesvenain Jan 21, 2015
c0abe43

Merge pull request #1 from tdesvenain/master


sampwing Jan 27, 2015
3e6c7cd

Added unit tests in build_extra_hosts + fix


tdesvenain Feb 25, 2015
d88d668

Merge pull request #2 from tdesvenain/master


sampwing Feb 27, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 17 additions & 0 deletions
docs/yml.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,23 @@ external_links:
 - project_db_1:postgresql
```

### extra_hosts

Add hostname mappings. Use the same values as the docker client `--add-hosts` parameter.

```
extra_hosts:
 - docker: 162.242.195.82
 - fig: 50.31.209.229
```

An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:

```
162.242.195.82 docker
50.31.209.229 fig
```

### ports

Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container port (a random host port will be chosen).
Expand Down

27 changes: 26 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
 'entrypoint',
 'env_file',
 'environment',
 'extra_hosts',
 'hostname',
 'image',
 'mem_limit',
Expand All@@ -43,6 +44,7 @@
]
DOCKER_CONFIG_HINTS = {
 'cpu_share' : 'cpu_shares',
 'add_host' : 'extra_hosts',
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
Expand All@@ -58,6 +60,7 @@
 'dns',
 'dns_search',
 'env_file',
 'extra_hosts',
 'net',
 'privileged',
 'restart',
Expand DownExpand Up@@ -97,7 +100,6 @@ def __init__(self, name, client=None, project='default', links=None, external_li

 supported_options = DOCKER_CONFIG_KEYS + ['build', 'expose',
 'external_links']

 for k in options:
 if k not in supported_options:
 msg = "Unsupported config option for %s service: '%s'" % (name, k)
Expand DownExpand Up@@ -322,6 +324,8 @@ def start_container(self, container, intermediate_container=None, **override_opt

 restart = parse_restart_spec(options.get('restart', None))

 extra_hosts = build_extra_hosts(options.get('extra_hosts', None))

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
Expand All@@ -334,6 +338,7 @@ def start_container(self, container, intermediate_container=None, **override_opt
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 extra_hosts=extra_hosts,
 )
 return container

Expand DownExpand Up@@ -629,6 +634,26 @@ def split_port(port):
 return internal_port, (external_ip, external_port or None)


def build_extra_hosts(extra_hosts_config):
 if extra_hosts_config is None:
 return None

 if isinstance(extra_hosts_config, basestring):
 extra_hosts_config = [extra_hosts_config]

 extra_hosts_dict = {}
 for extra_hosts_line in extra_hosts_config:
 if isinstance(extra_hosts_line, dict):
 # already interpreted as a dict (depends on pyyaml version)
 extra_hosts_dict.update(extra_hosts_line)
 else:
 # not already interpreted as a dict
 host, ip = extra_hosts_line.split(':')
 extra_hosts_dict.update({host.strip(): ip.strip()})

 return extra_hosts_dict


def merge_environment(options):
 env = {}

Expand Down

2 changes: 1 addition & 1 deletion
requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==0.6.0
docker-py==0.7.1
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1
Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ def find_version(*file_paths):
 'requests >= 2.2.1, < 3',
 'texttable >= 0.8.1, < 0.9',
 'websocket-client >= 0.11.0, < 0.12',
 'docker-py >= 0.6.0, < 0.7',
 'docker-py >= 0.7.1, < 0.8',
 'dockerpty >= 0.3.2, < 0.4',
 'six >= 1.3.0, < 2',
]
Expand Down

37 changes: 37 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

from fig import Service
from fig.service import CannotBeScaledError
from fig.service import build_extra_hosts
from fig.container import Container
from docker.errors import APIError
from .testcases import DockerClientTestCase
Expand DownExpand Up@@ -106,6 +107,42 @@ def test_create_container_with_cpu_shares(self):
 service.start_container(container)
 self.assertEqual(container.inspect()['Config']['CpuShares'], 73)

 def test_build_extra_hosts(self):
 # string
 self.assertEqual(build_extra_hosts("www.example.com: 192.168.0.17"),
 {'www.example.com': '192.168.0.17'})

 # list of strings
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17"]),
 {'www.example.com': '192.168.0.17'})
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17",
 "api.example.com: 192.168.0.18"]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})
 # list of dictionaries
 self.assertEqual(build_extra_hosts(
 [{'www.example.com': '192.168.0.17'},
 {'api.example.com': '192.168.0.18'}
 ]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})

 def test_create_container_with_extra_hosts_list(self):
 extra_hosts = ['docker:162.242.195.82', 'fig:50.31.209.229']
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), extra_hosts)

 def test_create_container_with_extra_hosts_string(self):
 extra_hosts = 'docker:162.242.195.82'
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), [extra_hosts])

 def test_create_container_with_specified_volume(self):
 host_path = '/tmp/host-path'
 container_path = '/container-path'
Expand Down

, '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 support for docker's client's --add-host command by sampwing · Pull Request #848 · docker/compose · GitHub
Skip to content
Add support for docker's client's --add-host command#848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sampwing
wants to merge
6
commits into

from

 Closed


Add support for docker's client's --add-host command
#848
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
bfa7d45

upgraded docker-py from 0.6.0 to 0.7.1


sampwing Jan 15, 2015
f3999c6

added the extra_hosts option to the yml configuration which exposes t…


sampwing Jan 15, 2015
c33d131

Fix when pyyaml has interpreted line as a dictionary


tdesvenain Jan 21, 2015
c0abe43

Merge pull request #1 from tdesvenain/master


sampwing Jan 27, 2015
3e6c7cd

Added unit tests in build_extra_hosts + fix


tdesvenain Feb 25, 2015
d88d668

Merge pull request #2 from tdesvenain/master


sampwing Feb 27, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 17 additions & 0 deletions
docs/yml.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,23 @@ external_links:
 - project_db_1:postgresql
```

### extra_hosts

Add hostname mappings. Use the same values as the docker client `--add-hosts` parameter.

```
extra_hosts:
 - docker: 162.242.195.82
 - fig: 50.31.209.229
```

An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:

```
162.242.195.82 docker
50.31.209.229 fig
```

### ports

Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container port (a random host port will be chosen).
Expand Down

27 changes: 26 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
 'entrypoint',
 'env_file',
 'environment',
 'extra_hosts',
 'hostname',
 'image',
 'mem_limit',
Expand All@@ -43,6 +44,7 @@
]
DOCKER_CONFIG_HINTS = {
 'cpu_share' : 'cpu_shares',
 'add_host' : 'extra_hosts',
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
Expand All@@ -58,6 +60,7 @@
 'dns',
 'dns_search',
 'env_file',
 'extra_hosts',
 'net',
 'privileged',
 'restart',
Expand DownExpand Up@@ -97,7 +100,6 @@ def __init__(self, name, client=None, project='default', links=None, external_li

 supported_options = DOCKER_CONFIG_KEYS + ['build', 'expose',
 'external_links']

 for k in options:
 if k not in supported_options:
 msg = "Unsupported config option for %s service: '%s'" % (name, k)
Expand DownExpand Up@@ -322,6 +324,8 @@ def start_container(self, container, intermediate_container=None, **override_opt

 restart = parse_restart_spec(options.get('restart', None))

 extra_hosts = build_extra_hosts(options.get('extra_hosts', None))

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
Expand All@@ -334,6 +338,7 @@ def start_container(self, container, intermediate_container=None, **override_opt
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 extra_hosts=extra_hosts,
 )
 return container

Expand DownExpand Up@@ -629,6 +634,26 @@ def split_port(port):
 return internal_port, (external_ip, external_port or None)


def build_extra_hosts(extra_hosts_config):
 if extra_hosts_config is None:
 return None

 if isinstance(extra_hosts_config, basestring):
 extra_hosts_config = [extra_hosts_config]

 extra_hosts_dict = {}
 for extra_hosts_line in extra_hosts_config:
 if isinstance(extra_hosts_line, dict):
 # already interpreted as a dict (depends on pyyaml version)
 extra_hosts_dict.update(extra_hosts_line)
 else:
 # not already interpreted as a dict
 host, ip = extra_hosts_line.split(':')
 extra_hosts_dict.update({host.strip(): ip.strip()})

 return extra_hosts_dict


def merge_environment(options):
 env = {}

Expand Down

2 changes: 1 addition & 1 deletion
requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==0.6.0
docker-py==0.7.1
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1
Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ def find_version(*file_paths):
 'requests >= 2.2.1, < 3',
 'texttable >= 0.8.1, < 0.9',
 'websocket-client >= 0.11.0, < 0.12',
 'docker-py >= 0.6.0, < 0.7',
 'docker-py >= 0.7.1, < 0.8',
 'dockerpty >= 0.3.2, < 0.4',
 'six >= 1.3.0, < 2',
]
Expand Down

37 changes: 37 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

from fig import Service
from fig.service import CannotBeScaledError
from fig.service import build_extra_hosts
from fig.container import Container
from docker.errors import APIError
from .testcases import DockerClientTestCase
Expand DownExpand Up@@ -106,6 +107,42 @@ def test_create_container_with_cpu_shares(self):
 service.start_container(container)
 self.assertEqual(container.inspect()['Config']['CpuShares'], 73)

 def test_build_extra_hosts(self):
 # string
 self.assertEqual(build_extra_hosts("www.example.com: 192.168.0.17"),
 {'www.example.com': '192.168.0.17'})

 # list of strings
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17"]),
 {'www.example.com': '192.168.0.17'})
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17",
 "api.example.com: 192.168.0.18"]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})
 # list of dictionaries
 self.assertEqual(build_extra_hosts(
 [{'www.example.com': '192.168.0.17'},
 {'api.example.com': '192.168.0.18'}
 ]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})

 def test_create_container_with_extra_hosts_list(self):
 extra_hosts = ['docker:162.242.195.82', 'fig:50.31.209.229']
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), extra_hosts)

 def test_create_container_with_extra_hosts_string(self):
 extra_hosts = 'docker:162.242.195.82'
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), [extra_hosts])

 def test_create_container_with_specified_volume(self):
 host_path = '/tmp/host-path'
 container_path = '/container-path'
Expand Down

, '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 support for docker's client's --add-host command by sampwing · Pull Request #848 · docker/compose · GitHub
Skip to content
Add support for docker's client's --add-host command#848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sampwing
wants to merge
6
commits into

from

 Closed


Add support for docker's client's --add-host command
#848
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
bfa7d45

upgraded docker-py from 0.6.0 to 0.7.1


sampwing Jan 15, 2015
f3999c6

added the extra_hosts option to the yml configuration which exposes t…


sampwing Jan 15, 2015
c33d131

Fix when pyyaml has interpreted line as a dictionary


tdesvenain Jan 21, 2015
c0abe43

Merge pull request #1 from tdesvenain/master


sampwing Jan 27, 2015
3e6c7cd

Added unit tests in build_extra_hosts + fix


tdesvenain Feb 25, 2015
d88d668

Merge pull request #2 from tdesvenain/master


sampwing Feb 27, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 17 additions & 0 deletions
docs/yml.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,23 @@ external_links:
 - project_db_1:postgresql
```

### extra_hosts

Add hostname mappings. Use the same values as the docker client `--add-hosts` parameter.

```
extra_hosts:
 - docker: 162.242.195.82
 - fig: 50.31.209.229
```

An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:

```
162.242.195.82 docker
50.31.209.229 fig
```

### ports

Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container port (a random host port will be chosen).
Expand Down

27 changes: 26 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
 'entrypoint',
 'env_file',
 'environment',
 'extra_hosts',
 'hostname',
 'image',
 'mem_limit',
Expand All@@ -43,6 +44,7 @@
]
DOCKER_CONFIG_HINTS = {
 'cpu_share' : 'cpu_shares',
 'add_host' : 'extra_hosts',
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
Expand All@@ -58,6 +60,7 @@
 'dns',
 'dns_search',
 'env_file',
 'extra_hosts',
 'net',
 'privileged',
 'restart',
Expand DownExpand Up@@ -97,7 +100,6 @@ def __init__(self, name, client=None, project='default', links=None, external_li

 supported_options = DOCKER_CONFIG_KEYS + ['build', 'expose',
 'external_links']

 for k in options:
 if k not in supported_options:
 msg = "Unsupported config option for %s service: '%s'" % (name, k)
Expand DownExpand Up@@ -322,6 +324,8 @@ def start_container(self, container, intermediate_container=None, **override_opt

 restart = parse_restart_spec(options.get('restart', None))

 extra_hosts = build_extra_hosts(options.get('extra_hosts', None))

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
Expand All@@ -334,6 +338,7 @@ def start_container(self, container, intermediate_container=None, **override_opt
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 extra_hosts=extra_hosts,
 )
 return container

Expand DownExpand Up@@ -629,6 +634,26 @@ def split_port(port):
 return internal_port, (external_ip, external_port or None)


def build_extra_hosts(extra_hosts_config):
 if extra_hosts_config is None:
 return None

 if isinstance(extra_hosts_config, basestring):
 extra_hosts_config = [extra_hosts_config]

 extra_hosts_dict = {}
 for extra_hosts_line in extra_hosts_config:
 if isinstance(extra_hosts_line, dict):
 # already interpreted as a dict (depends on pyyaml version)
 extra_hosts_dict.update(extra_hosts_line)
 else:
 # not already interpreted as a dict
 host, ip = extra_hosts_line.split(':')
 extra_hosts_dict.update({host.strip(): ip.strip()})

 return extra_hosts_dict


def merge_environment(options):
 env = {}

Expand Down

2 changes: 1 addition & 1 deletion
requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==0.6.0
docker-py==0.7.1
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1
Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ def find_version(*file_paths):
 'requests >= 2.2.1, < 3',
 'texttable >= 0.8.1, < 0.9',
 'websocket-client >= 0.11.0, < 0.12',
 'docker-py >= 0.6.0, < 0.7',
 'docker-py >= 0.7.1, < 0.8',
 'dockerpty >= 0.3.2, < 0.4',
 'six >= 1.3.0, < 2',
]
Expand Down

37 changes: 37 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

from fig import Service
from fig.service import CannotBeScaledError
from fig.service import build_extra_hosts
from fig.container import Container
from docker.errors import APIError
from .testcases import DockerClientTestCase
Expand DownExpand Up@@ -106,6 +107,42 @@ def test_create_container_with_cpu_shares(self):
 service.start_container(container)
 self.assertEqual(container.inspect()['Config']['CpuShares'], 73)

 def test_build_extra_hosts(self):
 # string
 self.assertEqual(build_extra_hosts("www.example.com: 192.168.0.17"),
 {'www.example.com': '192.168.0.17'})

 # list of strings
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17"]),
 {'www.example.com': '192.168.0.17'})
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17",
 "api.example.com: 192.168.0.18"]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})
 # list of dictionaries
 self.assertEqual(build_extra_hosts(
 [{'www.example.com': '192.168.0.17'},
 {'api.example.com': '192.168.0.18'}
 ]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})

 def test_create_container_with_extra_hosts_list(self):
 extra_hosts = ['docker:162.242.195.82', 'fig:50.31.209.229']
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), extra_hosts)

 def test_create_container_with_extra_hosts_string(self):
 extra_hosts = 'docker:162.242.195.82'
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), [extra_hosts])

 def test_create_container_with_specified_volume(self):
 host_path = '/tmp/host-path'
 container_path = '/container-path'
Expand Down

, '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 support for docker's client's --add-host command by sampwing · Pull Request #848 · docker/compose · GitHub
Skip to content
Add support for docker's client's --add-host command#848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sampwing
wants to merge
6
commits into

from

 Closed


Add support for docker's client's --add-host command
#848
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
bfa7d45

upgraded docker-py from 0.6.0 to 0.7.1


sampwing Jan 15, 2015
f3999c6

added the extra_hosts option to the yml configuration which exposes t…


sampwing Jan 15, 2015
c33d131

Fix when pyyaml has interpreted line as a dictionary


tdesvenain Jan 21, 2015
c0abe43

Merge pull request #1 from tdesvenain/master


sampwing Jan 27, 2015
3e6c7cd

Added unit tests in build_extra_hosts + fix


tdesvenain Feb 25, 2015
d88d668

Merge pull request #2 from tdesvenain/master


sampwing Feb 27, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 17 additions & 0 deletions
docs/yml.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,23 @@ external_links:
 - project_db_1:postgresql
```

### extra_hosts

Add hostname mappings. Use the same values as the docker client `--add-hosts` parameter.

```
extra_hosts:
 - docker: 162.242.195.82
 - fig: 50.31.209.229
```

An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:

```
162.242.195.82 docker
50.31.209.229 fig
```

### ports

Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container port (a random host port will be chosen).
Expand Down

27 changes: 26 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
 'entrypoint',
 'env_file',
 'environment',
 'extra_hosts',
 'hostname',
 'image',
 'mem_limit',
Expand All@@ -43,6 +44,7 @@
]
DOCKER_CONFIG_HINTS = {
 'cpu_share' : 'cpu_shares',
 'add_host' : 'extra_hosts',
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
Expand All@@ -58,6 +60,7 @@
 'dns',
 'dns_search',
 'env_file',
 'extra_hosts',
 'net',
 'privileged',
 'restart',
Expand DownExpand Up@@ -97,7 +100,6 @@ def __init__(self, name, client=None, project='default', links=None, external_li

 supported_options = DOCKER_CONFIG_KEYS + ['build', 'expose',
 'external_links']

 for k in options:
 if k not in supported_options:
 msg = "Unsupported config option for %s service: '%s'" % (name, k)
Expand DownExpand Up@@ -322,6 +324,8 @@ def start_container(self, container, intermediate_container=None, **override_opt

 restart = parse_restart_spec(options.get('restart', None))

 extra_hosts = build_extra_hosts(options.get('extra_hosts', None))

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
Expand All@@ -334,6 +338,7 @@ def start_container(self, container, intermediate_container=None, **override_opt
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 extra_hosts=extra_hosts,
 )
 return container

Expand DownExpand Up@@ -629,6 +634,26 @@ def split_port(port):
 return internal_port, (external_ip, external_port or None)


def build_extra_hosts(extra_hosts_config):
 if extra_hosts_config is None:
 return None

 if isinstance(extra_hosts_config, basestring):
 extra_hosts_config = [extra_hosts_config]

 extra_hosts_dict = {}
 for extra_hosts_line in extra_hosts_config:
 if isinstance(extra_hosts_line, dict):
 # already interpreted as a dict (depends on pyyaml version)
 extra_hosts_dict.update(extra_hosts_line)
 else:
 # not already interpreted as a dict
 host, ip = extra_hosts_line.split(':')
 extra_hosts_dict.update({host.strip(): ip.strip()})

 return extra_hosts_dict


def merge_environment(options):
 env = {}

Expand Down

2 changes: 1 addition & 1 deletion
requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==0.6.0
docker-py==0.7.1
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1
Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ def find_version(*file_paths):
 'requests >= 2.2.1, < 3',
 'texttable >= 0.8.1, < 0.9',
 'websocket-client >= 0.11.0, < 0.12',
 'docker-py >= 0.6.0, < 0.7',
 'docker-py >= 0.7.1, < 0.8',
 'dockerpty >= 0.3.2, < 0.4',
 'six >= 1.3.0, < 2',
]
Expand Down

37 changes: 37 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

from fig import Service
from fig.service import CannotBeScaledError
from fig.service import build_extra_hosts
from fig.container import Container
from docker.errors import APIError
from .testcases import DockerClientTestCase
Expand DownExpand Up@@ -106,6 +107,42 @@ def test_create_container_with_cpu_shares(self):
 service.start_container(container)
 self.assertEqual(container.inspect()['Config']['CpuShares'], 73)

 def test_build_extra_hosts(self):
 # string
 self.assertEqual(build_extra_hosts("www.example.com: 192.168.0.17"),
 {'www.example.com': '192.168.0.17'})

 # list of strings
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17"]),
 {'www.example.com': '192.168.0.17'})
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17",
 "api.example.com: 192.168.0.18"]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})
 # list of dictionaries
 self.assertEqual(build_extra_hosts(
 [{'www.example.com': '192.168.0.17'},
 {'api.example.com': '192.168.0.18'}
 ]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})

 def test_create_container_with_extra_hosts_list(self):
 extra_hosts = ['docker:162.242.195.82', 'fig:50.31.209.229']
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), extra_hosts)

 def test_create_container_with_extra_hosts_string(self):
 extra_hosts = 'docker:162.242.195.82'
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), [extra_hosts])

 def test_create_container_with_specified_volume(self):
 host_path = '/tmp/host-path'
 container_path = '/container-path'
Expand Down

, '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 support for docker's client's --add-host command by sampwing · Pull Request #848 · docker/compose · GitHub
Skip to content
Add support for docker's client's --add-host command#848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sampwing
wants to merge
6
commits into

from

 Closed


Add support for docker's client's --add-host command
#848
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
bfa7d45

upgraded docker-py from 0.6.0 to 0.7.1


sampwing Jan 15, 2015
f3999c6

added the extra_hosts option to the yml configuration which exposes t…


sampwing Jan 15, 2015
c33d131

Fix when pyyaml has interpreted line as a dictionary


tdesvenain Jan 21, 2015
c0abe43

Merge pull request #1 from tdesvenain/master


sampwing Jan 27, 2015
3e6c7cd

Added unit tests in build_extra_hosts + fix


tdesvenain Feb 25, 2015
d88d668

Merge pull request #2 from tdesvenain/master


sampwing Feb 27, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 17 additions & 0 deletions
docs/yml.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,23 @@ external_links:
 - project_db_1:postgresql
```

### extra_hosts

Add hostname mappings. Use the same values as the docker client `--add-hosts` parameter.

```
extra_hosts:
 - docker: 162.242.195.82
 - fig: 50.31.209.229
```

An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:

```
162.242.195.82 docker
50.31.209.229 fig
```

### ports

Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container port (a random host port will be chosen).
Expand Down

27 changes: 26 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
 'entrypoint',
 'env_file',
 'environment',
 'extra_hosts',
 'hostname',
 'image',
 'mem_limit',
Expand All@@ -43,6 +44,7 @@
]
DOCKER_CONFIG_HINTS = {
 'cpu_share' : 'cpu_shares',
 'add_host' : 'extra_hosts',
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
Expand All@@ -58,6 +60,7 @@
 'dns',
 'dns_search',
 'env_file',
 'extra_hosts',
 'net',
 'privileged',
 'restart',
Expand DownExpand Up@@ -97,7 +100,6 @@ def __init__(self, name, client=None, project='default', links=None, external_li

 supported_options = DOCKER_CONFIG_KEYS + ['build', 'expose',
 'external_links']

 for k in options:
 if k not in supported_options:
 msg = "Unsupported config option for %s service: '%s'" % (name, k)
Expand DownExpand Up@@ -322,6 +324,8 @@ def start_container(self, container, intermediate_container=None, **override_opt

 restart = parse_restart_spec(options.get('restart', None))

 extra_hosts = build_extra_hosts(options.get('extra_hosts', None))

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
Expand All@@ -334,6 +338,7 @@ def start_container(self, container, intermediate_container=None, **override_opt
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 extra_hosts=extra_hosts,
 )
 return container

Expand DownExpand Up@@ -629,6 +634,26 @@ def split_port(port):
 return internal_port, (external_ip, external_port or None)


def build_extra_hosts(extra_hosts_config):
 if extra_hosts_config is None:
 return None

 if isinstance(extra_hosts_config, basestring):
 extra_hosts_config = [extra_hosts_config]

 extra_hosts_dict = {}
 for extra_hosts_line in extra_hosts_config:
 if isinstance(extra_hosts_line, dict):
 # already interpreted as a dict (depends on pyyaml version)
 extra_hosts_dict.update(extra_hosts_line)
 else:
 # not already interpreted as a dict
 host, ip = extra_hosts_line.split(':')
 extra_hosts_dict.update({host.strip(): ip.strip()})

 return extra_hosts_dict


def merge_environment(options):
 env = {}

Expand Down

2 changes: 1 addition & 1 deletion
requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==0.6.0
docker-py==0.7.1
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1
Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ def find_version(*file_paths):
 'requests >= 2.2.1, < 3',
 'texttable >= 0.8.1, < 0.9',
 'websocket-client >= 0.11.0, < 0.12',
 'docker-py >= 0.6.0, < 0.7',
 'docker-py >= 0.7.1, < 0.8',
 'dockerpty >= 0.3.2, < 0.4',
 'six >= 1.3.0, < 2',
]
Expand Down

37 changes: 37 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

from fig import Service
from fig.service import CannotBeScaledError
from fig.service import build_extra_hosts
from fig.container import Container
from docker.errors import APIError
from .testcases import DockerClientTestCase
Expand DownExpand Up@@ -106,6 +107,42 @@ def test_create_container_with_cpu_shares(self):
 service.start_container(container)
 self.assertEqual(container.inspect()['Config']['CpuShares'], 73)

 def test_build_extra_hosts(self):
 # string
 self.assertEqual(build_extra_hosts("www.example.com: 192.168.0.17"),
 {'www.example.com': '192.168.0.17'})

 # list of strings
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17"]),
 {'www.example.com': '192.168.0.17'})
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17",
 "api.example.com: 192.168.0.18"]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})
 # list of dictionaries
 self.assertEqual(build_extra_hosts(
 [{'www.example.com': '192.168.0.17'},
 {'api.example.com': '192.168.0.18'}
 ]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})

 def test_create_container_with_extra_hosts_list(self):
 extra_hosts = ['docker:162.242.195.82', 'fig:50.31.209.229']
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), extra_hosts)

 def test_create_container_with_extra_hosts_string(self):
 extra_hosts = 'docker:162.242.195.82'
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), [extra_hosts])

 def test_create_container_with_specified_volume(self):
 host_path = '/tmp/host-path'
 container_path = '/container-path'
Expand Down

, '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); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add support for docker's client's --add-host command by sampwing · Pull Request #848 · docker/compose · GitHub
Skip to content
Add support for docker's client's --add-host command#848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sampwing
wants to merge
6
commits into

from

 Closed


Add support for docker's client's --add-host command
#848
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
bfa7d45

upgraded docker-py from 0.6.0 to 0.7.1


sampwing Jan 15, 2015
f3999c6

added the extra_hosts option to the yml configuration which exposes t…


sampwing Jan 15, 2015
c33d131

Fix when pyyaml has interpreted line as a dictionary


tdesvenain Jan 21, 2015
c0abe43

Merge pull request #1 from tdesvenain/master


sampwing Jan 27, 2015
3e6c7cd

Added unit tests in build_extra_hosts + fix


tdesvenain Feb 25, 2015
d88d668

Merge pull request #2 from tdesvenain/master


sampwing Feb 27, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 17 additions & 0 deletions
docs/yml.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,23 @@ external_links:
 - project_db_1:postgresql
```

### extra_hosts

Add hostname mappings. Use the same values as the docker client `--add-hosts` parameter.

```
extra_hosts:
 - docker: 162.242.195.82
 - fig: 50.31.209.229
```

An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:

```
162.242.195.82 docker
50.31.209.229 fig
```

### ports

Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container port (a random host port will be chosen).
Expand Down

27 changes: 26 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
 'entrypoint',
 'env_file',
 'environment',
 'extra_hosts',
 'hostname',
 'image',
 'mem_limit',
Expand All@@ -43,6 +44,7 @@
]
DOCKER_CONFIG_HINTS = {
 'cpu_share' : 'cpu_shares',
 'add_host' : 'extra_hosts',
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
Expand All@@ -58,6 +60,7 @@
 'dns',
 'dns_search',
 'env_file',
 'extra_hosts',
 'net',
 'privileged',
 'restart',
Expand DownExpand Up@@ -97,7 +100,6 @@ def __init__(self, name, client=None, project='default', links=None, external_li

 supported_options = DOCKER_CONFIG_KEYS + ['build', 'expose',
 'external_links']

 for k in options:
 if k not in supported_options:
 msg = "Unsupported config option for %s service: '%s'" % (name, k)
Expand DownExpand Up@@ -322,6 +324,8 @@ def start_container(self, container, intermediate_container=None, **override_opt

 restart = parse_restart_spec(options.get('restart', None))

 extra_hosts = build_extra_hosts(options.get('extra_hosts', None))

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
Expand All@@ -334,6 +338,7 @@ def start_container(self, container, intermediate_container=None, **override_opt
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 extra_hosts=extra_hosts,
 )
 return container

Expand DownExpand Up@@ -629,6 +634,26 @@ def split_port(port):
 return internal_port, (external_ip, external_port or None)


def build_extra_hosts(extra_hosts_config):
 if extra_hosts_config is None:
 return None

 if isinstance(extra_hosts_config, basestring):
 extra_hosts_config = [extra_hosts_config]

 extra_hosts_dict = {}
 for extra_hosts_line in extra_hosts_config:
 if isinstance(extra_hosts_line, dict):
 # already interpreted as a dict (depends on pyyaml version)
 extra_hosts_dict.update(extra_hosts_line)
 else:
 # not already interpreted as a dict
 host, ip = extra_hosts_line.split(':')
 extra_hosts_dict.update({host.strip(): ip.strip()})

 return extra_hosts_dict


def merge_environment(options):
 env = {}

Expand Down

2 changes: 1 addition & 1 deletion
requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==0.6.0
docker-py==0.7.1
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1
Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ def find_version(*file_paths):
 'requests >= 2.2.1, < 3',
 'texttable >= 0.8.1, < 0.9',
 'websocket-client >= 0.11.0, < 0.12',
 'docker-py >= 0.6.0, < 0.7',
 'docker-py >= 0.7.1, < 0.8',
 'dockerpty >= 0.3.2, < 0.4',
 'six >= 1.3.0, < 2',
]
Expand Down

37 changes: 37 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

from fig import Service
from fig.service import CannotBeScaledError
from fig.service import build_extra_hosts
from fig.container import Container
from docker.errors import APIError
from .testcases import DockerClientTestCase
Expand DownExpand Up@@ -106,6 +107,42 @@ def test_create_container_with_cpu_shares(self):
 service.start_container(container)
 self.assertEqual(container.inspect()['Config']['CpuShares'], 73)

 def test_build_extra_hosts(self):
 # string
 self.assertEqual(build_extra_hosts("www.example.com: 192.168.0.17"),
 {'www.example.com': '192.168.0.17'})

 # list of strings
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17"]),
 {'www.example.com': '192.168.0.17'})
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17",
 "api.example.com: 192.168.0.18"]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})
 # list of dictionaries
 self.assertEqual(build_extra_hosts(
 [{'www.example.com': '192.168.0.17'},
 {'api.example.com': '192.168.0.18'}
 ]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})

 def test_create_container_with_extra_hosts_list(self):
 extra_hosts = ['docker:162.242.195.82', 'fig:50.31.209.229']
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), extra_hosts)

 def test_create_container_with_extra_hosts_string(self):
 extra_hosts = 'docker:162.242.195.82'
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), [extra_hosts])

 def test_create_container_with_specified_volume(self):
 host_path = '/tmp/host-path'
 container_path = '/container-path'
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add support for docker's client's --add-host command by sampwing · Pull Request #848 · docker/compose · GitHub
Skip to content
Add support for docker's client's --add-host command#848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

sampwing
wants to merge
6
commits into

from

 Closed


Add support for docker's client's --add-host command
#848
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
bfa7d45

upgraded docker-py from 0.6.0 to 0.7.1


sampwing Jan 15, 2015
f3999c6

added the extra_hosts option to the yml configuration which exposes t…


sampwing Jan 15, 2015
c33d131

Fix when pyyaml has interpreted line as a dictionary


tdesvenain Jan 21, 2015
c0abe43

Merge pull request #1 from tdesvenain/master


sampwing Jan 27, 2015
3e6c7cd

Added unit tests in build_extra_hosts + fix


tdesvenain Feb 25, 2015
d88d668

Merge pull request #2 from tdesvenain/master


sampwing Feb 27, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 17 additions & 0 deletions
docs/yml.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,23 @@ external_links:
 - project_db_1:postgresql
```

### extra_hosts

Add hostname mappings. Use the same values as the docker client `--add-hosts` parameter.

```
extra_hosts:
 - docker: 162.242.195.82
 - fig: 50.31.209.229
```

An entry with the ip address and hostname will be created in `/etc/hosts` inside containers for this service, e.g:

```
162.242.195.82 docker
50.31.209.229 fig
```

### ports

Expose ports. Either specify both ports (`HOST:CONTAINER`), or just the container port (a random host port will be chosen).
Expand Down

27 changes: 26 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@
 'entrypoint',
 'env_file',
 'environment',
 'extra_hosts',
 'hostname',
 'image',
 'mem_limit',
Expand All@@ -43,6 +44,7 @@
]
DOCKER_CONFIG_HINTS = {
 'cpu_share' : 'cpu_shares',
 'add_host' : 'extra_hosts',
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
Expand All@@ -58,6 +60,7 @@
 'dns',
 'dns_search',
 'env_file',
 'extra_hosts',
 'net',
 'privileged',
 'restart',
Expand DownExpand Up@@ -97,7 +100,6 @@ def __init__(self, name, client=None, project='default', links=None, external_li

 supported_options = DOCKER_CONFIG_KEYS + ['build', 'expose',
 'external_links']

 for k in options:
 if k not in supported_options:
 msg = "Unsupported config option for %s service: '%s'" % (name, k)
Expand DownExpand Up@@ -322,6 +324,8 @@ def start_container(self, container, intermediate_container=None, **override_opt

 restart = parse_restart_spec(options.get('restart', None))

 extra_hosts = build_extra_hosts(options.get('extra_hosts', None))

 container.start(
 links=self._get_links(link_to_self=options.get('one_off', False)),
 port_bindings=port_bindings,
Expand All@@ -334,6 +338,7 @@ def start_container(self, container, intermediate_container=None, **override_opt
 restart_policy=restart,
 cap_add=cap_add,
 cap_drop=cap_drop,
 extra_hosts=extra_hosts,
 )
 return container

Expand DownExpand Up@@ -629,6 +634,26 @@ def split_port(port):
 return internal_port, (external_ip, external_port or None)


def build_extra_hosts(extra_hosts_config):
 if extra_hosts_config is None:
 return None

 if isinstance(extra_hosts_config, basestring):
 extra_hosts_config = [extra_hosts_config]

 extra_hosts_dict = {}
 for extra_hosts_line in extra_hosts_config:
 if isinstance(extra_hosts_line, dict):
 # already interpreted as a dict (depends on pyyaml version)
 extra_hosts_dict.update(extra_hosts_line)
 else:
 # not already interpreted as a dict
 host, ip = extra_hosts_line.split(':')
 extra_hosts_dict.update({host.strip(): ip.strip()})

 return extra_hosts_dict


def merge_environment(options):
 env = {}

Expand Down

2 changes: 1 addition & 1 deletion
requirements.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
PyYAML==3.10
docker-py==0.6.0
docker-py==0.7.1
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1
Expand Down

2 changes: 1 addition & 1 deletion
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ def find_version(*file_paths):
 'requests >= 2.2.1, < 3',
 'texttable >= 0.8.1, < 0.9',
 'websocket-client >= 0.11.0, < 0.12',
 'docker-py >= 0.6.0, < 0.7',
 'docker-py >= 0.7.1, < 0.8',
 'dockerpty >= 0.3.2, < 0.4',
 'six >= 1.3.0, < 2',
]
Expand Down

37 changes: 37 additions & 0 deletions
tests/integration/service_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

from fig import Service
from fig.service import CannotBeScaledError
from fig.service import build_extra_hosts
from fig.container import Container
from docker.errors import APIError
from .testcases import DockerClientTestCase
Expand DownExpand Up@@ -106,6 +107,42 @@ def test_create_container_with_cpu_shares(self):
 service.start_container(container)
 self.assertEqual(container.inspect()['Config']['CpuShares'], 73)

 def test_build_extra_hosts(self):
 # string
 self.assertEqual(build_extra_hosts("www.example.com: 192.168.0.17"),
 {'www.example.com': '192.168.0.17'})

 # list of strings
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17"]),
 {'www.example.com': '192.168.0.17'})
 self.assertEqual(build_extra_hosts(
 ["www.example.com: 192.168.0.17",
 "api.example.com: 192.168.0.18"]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})
 # list of dictionaries
 self.assertEqual(build_extra_hosts(
 [{'www.example.com': '192.168.0.17'},
 {'api.example.com': '192.168.0.18'}
 ]),
 {'www.example.com': '192.168.0.17',
 'api.example.com': '192.168.0.18'})

 def test_create_container_with_extra_hosts_list(self):
 extra_hosts = ['docker:162.242.195.82', 'fig:50.31.209.229']
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), extra_hosts)

 def test_create_container_with_extra_hosts_string(self):
 extra_hosts = 'docker:162.242.195.82'
 service = self.create_service('db', extra_hosts=extra_hosts)
 container = service.create_container()
 service.start_container(container)
 self.assertEqual(container.get('HostConfig.ExtraHosts'), [extra_hosts])

 def test_create_container_with_specified_volume(self):
 host_path = '/tmp/host-path'
 container_path = '/container-path'
Expand Down