Skip to content

Add option to configure devices in yaml file#469

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
twendt wants to merge 1 commit into from
Closed

Add option to configure devices in yaml file #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions fig/packages/docker/client.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ def _result(self, response, json=False, binary=False):
def _container_config(self, image, command, hostname=None, user=None,
detach=False, stdin_open=False, tty=False,
mem_limit=0, ports=None, environment=None, dns=None,
volumes=None, volumes_from=None,
volumes=None, volumes_from=None, devices=None,

@dnephindnephinSep 4, 2014

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Note, this is actually a vendored version of http://github.com/docker/docker-py

These changes should be made upstream

network_disabled=False, entrypoint=None,
cpu_shares=None, working_dir=None, domainname=None,
memswap_limit=0):
Expand DownExpand Up@@ -123,6 +123,12 @@ def _container_config(self, image, command, hostname=None, user=None,
volumes_dict[vol] = {}
volumes = volumes_dict

if isinstance(devices, list):
devices_dict = {}
for device in devices:
devices_dict[device] = {}
devices = devices_dict

if volumes_from:
if not isinstance(volumes_from, six.string_types):
volumes_from = ','.join(volumes_from)
Expand DownExpand Up@@ -169,6 +175,7 @@ def _container_config(self, image, command, hostname=None, user=None,
'Image': image,
'Volumes': volumes,
'VolumesFrom': volumes_from,
'Devices': devices,
'NetworkDisabled': network_disabled,
'Entrypoint': entrypoint,
'CpuShares': cpu_shares,
Expand DownExpand Up@@ -449,15 +456,16 @@ def copy(self, container, resource):
def create_container(self, image, command=None, hostname=None, user=None,
detach=False, stdin_open=False, tty=False,
mem_limit=0, ports=None, environment=None, dns=None,
volumes=None, volumes_from=None,
volumes=None, volumes_from=None, devices=None,
network_disabled=False, name=None, entrypoint=None,
cpu_shares=None, working_dir=None, domainname=None,
memswap_limit=0):

config = self._container_config(
image, command, hostname, user, detach, stdin_open, tty, mem_limit,
ports, environment, dns, volumes, volumes_from, network_disabled,
entrypoint, cpu_shares, working_dir, domainname, memswap_limit
entrypoint, cpu_shares, working_dir, domainname, memswap_limit,
devices
)
return self.create_container_from_config(config, name)

Expand DownExpand Up@@ -748,7 +756,8 @@ def search(self, term):

def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
publish_all_ports=False, links=None, privileged=False,
dns=None, dns_search=None, volumes_from=None, network_mode=None):
dns=None, dns_search=None, volumes_from=None, network_mode=None,
device_binds=None):
if isinstance(container, dict):
container = container.get('Id')

Expand All@@ -769,6 +778,9 @@ def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
port_bindings
)

if device_binds:
start_config['Devices'] = utils.convert_device_binds(device_binds)

start_config['PublishAllPorts'] = publish_all_ports

if links:
Expand Down
14 changes: 14 additions & 0 deletions fig/packages/docker/utils/utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,20 @@ def convert_volume_binds(binds):
result.append('%s:%s:rw' % (k, v))
return result

def convert_device_binds(device_binds):
result = []
for k, v in device_binds.items():
device = {}
if isinstance(v, dict):
device['CgroupPermissions'] = 'rom' if v.get('rom', False) else 'rwm'
device['PathOnHost'] = v['bind']
else:
device['CgroupPermissions'] = 'rwm'
device['PathOnHost'] = v
device['PathInContainer'] = k
result.append(device)
return result


def parse_repository_tag(repo):
column_index = repo.rfind(':')
Expand Down
33 changes: 32 additions & 1 deletion fig/service.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,14 +11,15 @@
log = logging.getLogger(__name__)


DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'devices', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_HINTS = {
'link' : 'links',
'port' : 'ports',
'privilege' : 'privileged',
'priviliged': 'privileged',
'privilige' : 'privileged',
'volume' : 'volumes',
'device' : 'devices',
'workdir' : 'working_dir',
}

Expand DownExpand Up@@ -238,6 +239,22 @@ def start_container(self, container=None, intermediate_container=None, **overrid
'ro': False,
}

device_bindings = {}

if options.get('devices', None) is not None:
for device in options['devices']:
if ':' in device:
external_device, internal_device = device.split(':')
device_bindings[os.path.abspath(external_device)] = {
'bind': internal_device,
'rom': False,
}
else:
device_bindings[os.path.abspath(device)] = {
'bind': device,
'rom': False
}

privileged = options.get('privileged', False)
net = options.get('net', 'bridge')
dns = options.get('dns', None)
Expand All@@ -246,6 +263,7 @@ def start_container(self, container=None, intermediate_container=None, **overrid
links=self._get_links(link_to_self=override_options.get('one_off', False)),
port_bindings=port_bindings,
binds=volume_bindings,
device_binds=device_bindings,
volumes_from=self._get_volumes_from(intermediate_container),
privileged=privileged,
network_mode=net,
Expand DownExpand Up@@ -340,6 +358,9 @@ def _get_container_create_options(self, override_options, one_off=False):
if 'volumes' in container_options:
container_options['volumes'] = dict((split_volume(v)[1], {}) for v in container_options['volumes'])

if 'devices' in container_options:
container_options['devices'] = dict((split_device(v)[1], {}) for v in container_options['devices'])

if 'environment' in container_options:
if isinstance(container_options['environment'], list):
container_options['environment'] = dict(split_env(e) for e in container_options['environment'])
Expand DownExpand Up@@ -443,6 +464,16 @@ def split_volume(v):
else:
return (None, v)

def split_device(d):
"""
If d is of the format EXTERNAL:INTERNAL, returns (EXTERNAL, INTERNAL).
If d is of the format INTERNAL, returns (None, INTERNAL).
"""
if ':' in d:
return d.split(':', 1)
else:
return (None, d)


def split_port(port):
port = str(port)
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 option to configure devices in yaml file by twendt · Pull Request #469 · docker/compose · GitHub
Skip to content
Add option to configure devices in yaml file#469

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

twendt
wants to merge
1
commit into

from

 Closed


Add option to configure devices in yaml file
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


20 changes: 16 additions & 4 deletions
fig/packages/docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ def _result(self, response, json=False, binary=False):
 def _container_config(self, image, command, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
@dnephindnephinSep 4, 2014

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Note, this is actually a vendored version of http://github.com/docker/docker-py
These changes should be made upstream
 network_disabled=False, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):
Expand DownExpand Up@@ -123,6 +123,12 @@ def _container_config(self, image, command, hostname=None, user=None,
 volumes_dict[vol] = {}
 volumes = volumes_dict

 if isinstance(devices, list):
 devices_dict = {}
 for device in devices:
 devices_dict[device] = {}
 devices = devices_dict

 if volumes_from:
 if not isinstance(volumes_from, six.string_types):
 volumes_from = ','.join(volumes_from)
Expand DownExpand Up@@ -169,6 +175,7 @@ def _container_config(self, image, command, hostname=None, user=None,
 'Image': image,
 'Volumes': volumes,
 'VolumesFrom': volumes_from,
 'Devices': devices,
 'NetworkDisabled': network_disabled,
 'Entrypoint': entrypoint,
 'CpuShares': cpu_shares,
Expand DownExpand Up@@ -449,15 +456,16 @@ def copy(self, container, resource):
 def create_container(self, image, command=None, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
 network_disabled=False, name=None, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):

 config = self._container_config(
 image, command, hostname, user, detach, stdin_open, tty, mem_limit,
 ports, environment, dns, volumes, volumes_from, network_disabled,
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit,
 devices
 )
 return self.create_container_from_config(config, name)

Expand DownExpand Up@@ -748,7 +756,8 @@ def search(self, term):

 def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 publish_all_ports=False, links=None, privileged=False,
 dns=None, dns_search=None, volumes_from=None, network_mode=None):
 dns=None, dns_search=None, volumes_from=None, network_mode=None,
 device_binds=None):
 if isinstance(container, dict):
 container = container.get('Id')

Expand All@@ -769,6 +778,9 @@ def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 port_bindings
 )

 if device_binds:
 start_config['Devices'] = utils.convert_device_binds(device_binds)

 start_config['PublishAllPorts'] = publish_all_ports

 if links:
Expand Down

14 changes: 14 additions & 0 deletions
fig/packages/docker/utils/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,20 @@ def convert_volume_binds(binds):
 result.append('%s:%s:rw' % (k, v))
 return result

def convert_device_binds(device_binds):
 result = []
 for k, v in device_binds.items():
 device = {}
 if isinstance(v, dict):
 device['CgroupPermissions'] = 'rom' if v.get('rom', False) else 'rwm'
 device['PathOnHost'] = v['bind']
 else:
 device['CgroupPermissions'] = 'rwm'
 device['PathOnHost'] = v
 device['PathInContainer'] = k
 result.append(device)
 return result


def parse_repository_tag(repo):
 column_index = repo.rfind(':')
Expand Down

33 changes: 32 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,14 +11,15 @@
log = logging.getLogger(__name__)


DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'devices', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_HINTS = {
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
 'priviliged': 'privileged',
 'privilige' : 'privileged',
 'volume' : 'volumes',
 'device' : 'devices',
 'workdir' : 'working_dir',
}

Expand DownExpand Up@@ -238,6 +239,22 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 'ro': False,
 }

 device_bindings = {}

 if options.get('devices', None) is not None:
 for device in options['devices']:
 if ':' in device:
 external_device, internal_device = device.split(':')
 device_bindings[os.path.abspath(external_device)] = {
 'bind': internal_device,
 'rom': False,
 }
 else:
 device_bindings[os.path.abspath(device)] = {
 'bind': device,
 'rom': False
 }

 privileged = options.get('privileged', False)
 net = options.get('net', 'bridge')
 dns = options.get('dns', None)
Expand All@@ -246,6 +263,7 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 links=self._get_links(link_to_self=override_options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 device_binds=device_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=net,
Expand DownExpand Up@@ -340,6 +358,9 @@ def _get_container_create_options(self, override_options, one_off=False):
 if 'volumes' in container_options:
 container_options['volumes'] = dict((split_volume(v)[1], {}) for v in container_options['volumes'])

 if 'devices' in container_options:
 container_options['devices'] = dict((split_device(v)[1], {}) for v in container_options['devices'])

 if 'environment' in container_options:
 if isinstance(container_options['environment'], list):
 container_options['environment'] = dict(split_env(e) for e in container_options['environment'])
Expand DownExpand Up@@ -443,6 +464,16 @@ def split_volume(v):
 else:
 return (None, v)

def split_device(d):
 """
 If d is of the format EXTERNAL:INTERNAL, returns (EXTERNAL, INTERNAL).
 If d is of the format INTERNAL, returns (None, INTERNAL).
 """
 if ':' in d:
 return d.split(':', 1)
 else:
 return (None, d)


def split_port(port):
 port = str(port)
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 option to configure devices in yaml file by twendt · Pull Request #469 · docker/compose · GitHub
Skip to content
Add option to configure devices in yaml file#469

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

twendt
wants to merge
1
commit into

from

 Closed


Add option to configure devices in yaml file
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


20 changes: 16 additions & 4 deletions
fig/packages/docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ def _result(self, response, json=False, binary=False):
 def _container_config(self, image, command, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
@dnephindnephinSep 4, 2014

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Note, this is actually a vendored version of http://github.com/docker/docker-py
These changes should be made upstream
 network_disabled=False, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):
Expand DownExpand Up@@ -123,6 +123,12 @@ def _container_config(self, image, command, hostname=None, user=None,
 volumes_dict[vol] = {}
 volumes = volumes_dict

 if isinstance(devices, list):
 devices_dict = {}
 for device in devices:
 devices_dict[device] = {}
 devices = devices_dict

 if volumes_from:
 if not isinstance(volumes_from, six.string_types):
 volumes_from = ','.join(volumes_from)
Expand DownExpand Up@@ -169,6 +175,7 @@ def _container_config(self, image, command, hostname=None, user=None,
 'Image': image,
 'Volumes': volumes,
 'VolumesFrom': volumes_from,
 'Devices': devices,
 'NetworkDisabled': network_disabled,
 'Entrypoint': entrypoint,
 'CpuShares': cpu_shares,
Expand DownExpand Up@@ -449,15 +456,16 @@ def copy(self, container, resource):
 def create_container(self, image, command=None, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
 network_disabled=False, name=None, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):

 config = self._container_config(
 image, command, hostname, user, detach, stdin_open, tty, mem_limit,
 ports, environment, dns, volumes, volumes_from, network_disabled,
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit,
 devices
 )
 return self.create_container_from_config(config, name)

Expand DownExpand Up@@ -748,7 +756,8 @@ def search(self, term):

 def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 publish_all_ports=False, links=None, privileged=False,
 dns=None, dns_search=None, volumes_from=None, network_mode=None):
 dns=None, dns_search=None, volumes_from=None, network_mode=None,
 device_binds=None):
 if isinstance(container, dict):
 container = container.get('Id')

Expand All@@ -769,6 +778,9 @@ def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 port_bindings
 )

 if device_binds:
 start_config['Devices'] = utils.convert_device_binds(device_binds)

 start_config['PublishAllPorts'] = publish_all_ports

 if links:
Expand Down

14 changes: 14 additions & 0 deletions
fig/packages/docker/utils/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,20 @@ def convert_volume_binds(binds):
 result.append('%s:%s:rw' % (k, v))
 return result

def convert_device_binds(device_binds):
 result = []
 for k, v in device_binds.items():
 device = {}
 if isinstance(v, dict):
 device['CgroupPermissions'] = 'rom' if v.get('rom', False) else 'rwm'
 device['PathOnHost'] = v['bind']
 else:
 device['CgroupPermissions'] = 'rwm'
 device['PathOnHost'] = v
 device['PathInContainer'] = k
 result.append(device)
 return result


def parse_repository_tag(repo):
 column_index = repo.rfind(':')
Expand Down

33 changes: 32 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,14 +11,15 @@
log = logging.getLogger(__name__)


DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'devices', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_HINTS = {
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
 'priviliged': 'privileged',
 'privilige' : 'privileged',
 'volume' : 'volumes',
 'device' : 'devices',
 'workdir' : 'working_dir',
}

Expand DownExpand Up@@ -238,6 +239,22 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 'ro': False,
 }

 device_bindings = {}

 if options.get('devices', None) is not None:
 for device in options['devices']:
 if ':' in device:
 external_device, internal_device = device.split(':')
 device_bindings[os.path.abspath(external_device)] = {
 'bind': internal_device,
 'rom': False,
 }
 else:
 device_bindings[os.path.abspath(device)] = {
 'bind': device,
 'rom': False
 }

 privileged = options.get('privileged', False)
 net = options.get('net', 'bridge')
 dns = options.get('dns', None)
Expand All@@ -246,6 +263,7 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 links=self._get_links(link_to_self=override_options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 device_binds=device_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=net,
Expand DownExpand Up@@ -340,6 +358,9 @@ def _get_container_create_options(self, override_options, one_off=False):
 if 'volumes' in container_options:
 container_options['volumes'] = dict((split_volume(v)[1], {}) for v in container_options['volumes'])

 if 'devices' in container_options:
 container_options['devices'] = dict((split_device(v)[1], {}) for v in container_options['devices'])

 if 'environment' in container_options:
 if isinstance(container_options['environment'], list):
 container_options['environment'] = dict(split_env(e) for e in container_options['environment'])
Expand DownExpand Up@@ -443,6 +464,16 @@ def split_volume(v):
 else:
 return (None, v)

def split_device(d):
 """
 If d is of the format EXTERNAL:INTERNAL, returns (EXTERNAL, INTERNAL).
 If d is of the format INTERNAL, returns (None, INTERNAL).
 """
 if ':' in d:
 return d.split(':', 1)
 else:
 return (None, d)


def split_port(port):
 port = str(port)
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 option to configure devices in yaml file by twendt · Pull Request #469 · docker/compose · GitHub
Skip to content
Add option to configure devices in yaml file#469

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

twendt
wants to merge
1
commit into

from

 Closed


Add option to configure devices in yaml file
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


20 changes: 16 additions & 4 deletions
fig/packages/docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ def _result(self, response, json=False, binary=False):
 def _container_config(self, image, command, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
@dnephindnephinSep 4, 2014

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Note, this is actually a vendored version of http://github.com/docker/docker-py
These changes should be made upstream
 network_disabled=False, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):
Expand DownExpand Up@@ -123,6 +123,12 @@ def _container_config(self, image, command, hostname=None, user=None,
 volumes_dict[vol] = {}
 volumes = volumes_dict

 if isinstance(devices, list):
 devices_dict = {}
 for device in devices:
 devices_dict[device] = {}
 devices = devices_dict

 if volumes_from:
 if not isinstance(volumes_from, six.string_types):
 volumes_from = ','.join(volumes_from)
Expand DownExpand Up@@ -169,6 +175,7 @@ def _container_config(self, image, command, hostname=None, user=None,
 'Image': image,
 'Volumes': volumes,
 'VolumesFrom': volumes_from,
 'Devices': devices,
 'NetworkDisabled': network_disabled,
 'Entrypoint': entrypoint,
 'CpuShares': cpu_shares,
Expand DownExpand Up@@ -449,15 +456,16 @@ def copy(self, container, resource):
 def create_container(self, image, command=None, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
 network_disabled=False, name=None, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):

 config = self._container_config(
 image, command, hostname, user, detach, stdin_open, tty, mem_limit,
 ports, environment, dns, volumes, volumes_from, network_disabled,
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit,
 devices
 )
 return self.create_container_from_config(config, name)

Expand DownExpand Up@@ -748,7 +756,8 @@ def search(self, term):

 def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 publish_all_ports=False, links=None, privileged=False,
 dns=None, dns_search=None, volumes_from=None, network_mode=None):
 dns=None, dns_search=None, volumes_from=None, network_mode=None,
 device_binds=None):
 if isinstance(container, dict):
 container = container.get('Id')

Expand All@@ -769,6 +778,9 @@ def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 port_bindings
 )

 if device_binds:
 start_config['Devices'] = utils.convert_device_binds(device_binds)

 start_config['PublishAllPorts'] = publish_all_ports

 if links:
Expand Down

14 changes: 14 additions & 0 deletions
fig/packages/docker/utils/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,20 @@ def convert_volume_binds(binds):
 result.append('%s:%s:rw' % (k, v))
 return result

def convert_device_binds(device_binds):
 result = []
 for k, v in device_binds.items():
 device = {}
 if isinstance(v, dict):
 device['CgroupPermissions'] = 'rom' if v.get('rom', False) else 'rwm'
 device['PathOnHost'] = v['bind']
 else:
 device['CgroupPermissions'] = 'rwm'
 device['PathOnHost'] = v
 device['PathInContainer'] = k
 result.append(device)
 return result


def parse_repository_tag(repo):
 column_index = repo.rfind(':')
Expand Down

33 changes: 32 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,14 +11,15 @@
log = logging.getLogger(__name__)


DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'devices', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_HINTS = {
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
 'priviliged': 'privileged',
 'privilige' : 'privileged',
 'volume' : 'volumes',
 'device' : 'devices',
 'workdir' : 'working_dir',
}

Expand DownExpand Up@@ -238,6 +239,22 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 'ro': False,
 }

 device_bindings = {}

 if options.get('devices', None) is not None:
 for device in options['devices']:
 if ':' in device:
 external_device, internal_device = device.split(':')
 device_bindings[os.path.abspath(external_device)] = {
 'bind': internal_device,
 'rom': False,
 }
 else:
 device_bindings[os.path.abspath(device)] = {
 'bind': device,
 'rom': False
 }

 privileged = options.get('privileged', False)
 net = options.get('net', 'bridge')
 dns = options.get('dns', None)
Expand All@@ -246,6 +263,7 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 links=self._get_links(link_to_self=override_options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 device_binds=device_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=net,
Expand DownExpand Up@@ -340,6 +358,9 @@ def _get_container_create_options(self, override_options, one_off=False):
 if 'volumes' in container_options:
 container_options['volumes'] = dict((split_volume(v)[1], {}) for v in container_options['volumes'])

 if 'devices' in container_options:
 container_options['devices'] = dict((split_device(v)[1], {}) for v in container_options['devices'])

 if 'environment' in container_options:
 if isinstance(container_options['environment'], list):
 container_options['environment'] = dict(split_env(e) for e in container_options['environment'])
Expand DownExpand Up@@ -443,6 +464,16 @@ def split_volume(v):
 else:
 return (None, v)

def split_device(d):
 """
 If d is of the format EXTERNAL:INTERNAL, returns (EXTERNAL, INTERNAL).
 If d is of the format INTERNAL, returns (None, INTERNAL).
 """
 if ':' in d:
 return d.split(':', 1)
 else:
 return (None, d)


def split_port(port):
 port = str(port)
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 option to configure devices in yaml file by twendt · Pull Request #469 · docker/compose · GitHub
Skip to content
Add option to configure devices in yaml file#469

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

twendt
wants to merge
1
commit into

from

 Closed


Add option to configure devices in yaml file
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


20 changes: 16 additions & 4 deletions
fig/packages/docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ def _result(self, response, json=False, binary=False):
 def _container_config(self, image, command, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
@dnephindnephinSep 4, 2014

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Note, this is actually a vendored version of http://github.com/docker/docker-py
These changes should be made upstream
 network_disabled=False, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):
Expand DownExpand Up@@ -123,6 +123,12 @@ def _container_config(self, image, command, hostname=None, user=None,
 volumes_dict[vol] = {}
 volumes = volumes_dict

 if isinstance(devices, list):
 devices_dict = {}
 for device in devices:
 devices_dict[device] = {}
 devices = devices_dict

 if volumes_from:
 if not isinstance(volumes_from, six.string_types):
 volumes_from = ','.join(volumes_from)
Expand DownExpand Up@@ -169,6 +175,7 @@ def _container_config(self, image, command, hostname=None, user=None,
 'Image': image,
 'Volumes': volumes,
 'VolumesFrom': volumes_from,
 'Devices': devices,
 'NetworkDisabled': network_disabled,
 'Entrypoint': entrypoint,
 'CpuShares': cpu_shares,
Expand DownExpand Up@@ -449,15 +456,16 @@ def copy(self, container, resource):
 def create_container(self, image, command=None, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
 network_disabled=False, name=None, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):

 config = self._container_config(
 image, command, hostname, user, detach, stdin_open, tty, mem_limit,
 ports, environment, dns, volumes, volumes_from, network_disabled,
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit,
 devices
 )
 return self.create_container_from_config(config, name)

Expand DownExpand Up@@ -748,7 +756,8 @@ def search(self, term):

 def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 publish_all_ports=False, links=None, privileged=False,
 dns=None, dns_search=None, volumes_from=None, network_mode=None):
 dns=None, dns_search=None, volumes_from=None, network_mode=None,
 device_binds=None):
 if isinstance(container, dict):
 container = container.get('Id')

Expand All@@ -769,6 +778,9 @@ def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 port_bindings
 )

 if device_binds:
 start_config['Devices'] = utils.convert_device_binds(device_binds)

 start_config['PublishAllPorts'] = publish_all_ports

 if links:
Expand Down

14 changes: 14 additions & 0 deletions
fig/packages/docker/utils/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,20 @@ def convert_volume_binds(binds):
 result.append('%s:%s:rw' % (k, v))
 return result

def convert_device_binds(device_binds):
 result = []
 for k, v in device_binds.items():
 device = {}
 if isinstance(v, dict):
 device['CgroupPermissions'] = 'rom' if v.get('rom', False) else 'rwm'
 device['PathOnHost'] = v['bind']
 else:
 device['CgroupPermissions'] = 'rwm'
 device['PathOnHost'] = v
 device['PathInContainer'] = k
 result.append(device)
 return result


def parse_repository_tag(repo):
 column_index = repo.rfind(':')
Expand Down

33 changes: 32 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,14 +11,15 @@
log = logging.getLogger(__name__)


DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'devices', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_HINTS = {
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
 'priviliged': 'privileged',
 'privilige' : 'privileged',
 'volume' : 'volumes',
 'device' : 'devices',
 'workdir' : 'working_dir',
}

Expand DownExpand Up@@ -238,6 +239,22 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 'ro': False,
 }

 device_bindings = {}

 if options.get('devices', None) is not None:
 for device in options['devices']:
 if ':' in device:
 external_device, internal_device = device.split(':')
 device_bindings[os.path.abspath(external_device)] = {
 'bind': internal_device,
 'rom': False,
 }
 else:
 device_bindings[os.path.abspath(device)] = {
 'bind': device,
 'rom': False
 }

 privileged = options.get('privileged', False)
 net = options.get('net', 'bridge')
 dns = options.get('dns', None)
Expand All@@ -246,6 +263,7 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 links=self._get_links(link_to_self=override_options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 device_binds=device_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=net,
Expand DownExpand Up@@ -340,6 +358,9 @@ def _get_container_create_options(self, override_options, one_off=False):
 if 'volumes' in container_options:
 container_options['volumes'] = dict((split_volume(v)[1], {}) for v in container_options['volumes'])

 if 'devices' in container_options:
 container_options['devices'] = dict((split_device(v)[1], {}) for v in container_options['devices'])

 if 'environment' in container_options:
 if isinstance(container_options['environment'], list):
 container_options['environment'] = dict(split_env(e) for e in container_options['environment'])
Expand DownExpand Up@@ -443,6 +464,16 @@ def split_volume(v):
 else:
 return (None, v)

def split_device(d):
 """
 If d is of the format EXTERNAL:INTERNAL, returns (EXTERNAL, INTERNAL).
 If d is of the format INTERNAL, returns (None, INTERNAL).
 """
 if ':' in d:
 return d.split(':', 1)
 else:
 return (None, d)


def split_port(port):
 port = str(port)
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 option to configure devices in yaml file by twendt · Pull Request #469 · docker/compose · GitHub
Skip to content
Add option to configure devices in yaml file#469

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

twendt
wants to merge
1
commit into

from

 Closed


Add option to configure devices in yaml file
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


20 changes: 16 additions & 4 deletions
fig/packages/docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ def _result(self, response, json=False, binary=False):
 def _container_config(self, image, command, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
@dnephindnephinSep 4, 2014

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Note, this is actually a vendored version of http://github.com/docker/docker-py
These changes should be made upstream
 network_disabled=False, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):
Expand DownExpand Up@@ -123,6 +123,12 @@ def _container_config(self, image, command, hostname=None, user=None,
 volumes_dict[vol] = {}
 volumes = volumes_dict

 if isinstance(devices, list):
 devices_dict = {}
 for device in devices:
 devices_dict[device] = {}
 devices = devices_dict

 if volumes_from:
 if not isinstance(volumes_from, six.string_types):
 volumes_from = ','.join(volumes_from)
Expand DownExpand Up@@ -169,6 +175,7 @@ def _container_config(self, image, command, hostname=None, user=None,
 'Image': image,
 'Volumes': volumes,
 'VolumesFrom': volumes_from,
 'Devices': devices,
 'NetworkDisabled': network_disabled,
 'Entrypoint': entrypoint,
 'CpuShares': cpu_shares,
Expand DownExpand Up@@ -449,15 +456,16 @@ def copy(self, container, resource):
 def create_container(self, image, command=None, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
 network_disabled=False, name=None, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):

 config = self._container_config(
 image, command, hostname, user, detach, stdin_open, tty, mem_limit,
 ports, environment, dns, volumes, volumes_from, network_disabled,
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit,
 devices
 )
 return self.create_container_from_config(config, name)

Expand DownExpand Up@@ -748,7 +756,8 @@ def search(self, term):

 def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 publish_all_ports=False, links=None, privileged=False,
 dns=None, dns_search=None, volumes_from=None, network_mode=None):
 dns=None, dns_search=None, volumes_from=None, network_mode=None,
 device_binds=None):
 if isinstance(container, dict):
 container = container.get('Id')

Expand All@@ -769,6 +778,9 @@ def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 port_bindings
 )

 if device_binds:
 start_config['Devices'] = utils.convert_device_binds(device_binds)

 start_config['PublishAllPorts'] = publish_all_ports

 if links:
Expand Down

14 changes: 14 additions & 0 deletions
fig/packages/docker/utils/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,20 @@ def convert_volume_binds(binds):
 result.append('%s:%s:rw' % (k, v))
 return result

def convert_device_binds(device_binds):
 result = []
 for k, v in device_binds.items():
 device = {}
 if isinstance(v, dict):
 device['CgroupPermissions'] = 'rom' if v.get('rom', False) else 'rwm'
 device['PathOnHost'] = v['bind']
 else:
 device['CgroupPermissions'] = 'rwm'
 device['PathOnHost'] = v
 device['PathInContainer'] = k
 result.append(device)
 return result


def parse_repository_tag(repo):
 column_index = repo.rfind(':')
Expand Down

33 changes: 32 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,14 +11,15 @@
log = logging.getLogger(__name__)


DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'devices', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_HINTS = {
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
 'priviliged': 'privileged',
 'privilige' : 'privileged',
 'volume' : 'volumes',
 'device' : 'devices',
 'workdir' : 'working_dir',
}

Expand DownExpand Up@@ -238,6 +239,22 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 'ro': False,
 }

 device_bindings = {}

 if options.get('devices', None) is not None:
 for device in options['devices']:
 if ':' in device:
 external_device, internal_device = device.split(':')
 device_bindings[os.path.abspath(external_device)] = {
 'bind': internal_device,
 'rom': False,
 }
 else:
 device_bindings[os.path.abspath(device)] = {
 'bind': device,
 'rom': False
 }

 privileged = options.get('privileged', False)
 net = options.get('net', 'bridge')
 dns = options.get('dns', None)
Expand All@@ -246,6 +263,7 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 links=self._get_links(link_to_self=override_options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 device_binds=device_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=net,
Expand DownExpand Up@@ -340,6 +358,9 @@ def _get_container_create_options(self, override_options, one_off=False):
 if 'volumes' in container_options:
 container_options['volumes'] = dict((split_volume(v)[1], {}) for v in container_options['volumes'])

 if 'devices' in container_options:
 container_options['devices'] = dict((split_device(v)[1], {}) for v in container_options['devices'])

 if 'environment' in container_options:
 if isinstance(container_options['environment'], list):
 container_options['environment'] = dict(split_env(e) for e in container_options['environment'])
Expand DownExpand Up@@ -443,6 +464,16 @@ def split_volume(v):
 else:
 return (None, v)

def split_device(d):
 """
 If d is of the format EXTERNAL:INTERNAL, returns (EXTERNAL, INTERNAL).
 If d is of the format INTERNAL, returns (None, INTERNAL).
 """
 if ':' in d:
 return d.split(':', 1)
 else:
 return (None, d)


def split_port(port):
 port = str(port)
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); }
})();
})();
Add option to configure devices in yaml file by twendt · Pull Request #469 · docker/compose · GitHub
Skip to content
Add option to configure devices in yaml file#469

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

twendt
wants to merge
1
commit into

from

 Closed


Add option to configure devices in yaml file
#469
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


20 changes: 16 additions & 4 deletions
fig/packages/docker/client.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ def _result(self, response, json=False, binary=False):
 def _container_config(self, image, command, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
@dnephindnephinSep 4, 2014

Copy link


Copy Markdown

Choose a reason for hiding this comment

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

Note, this is actually a vendored version of http://github.com/docker/docker-py
These changes should be made upstream
 network_disabled=False, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):
Expand DownExpand Up@@ -123,6 +123,12 @@ def _container_config(self, image, command, hostname=None, user=None,
 volumes_dict[vol] = {}
 volumes = volumes_dict

 if isinstance(devices, list):
 devices_dict = {}
 for device in devices:
 devices_dict[device] = {}
 devices = devices_dict

 if volumes_from:
 if not isinstance(volumes_from, six.string_types):
 volumes_from = ','.join(volumes_from)
Expand DownExpand Up@@ -169,6 +175,7 @@ def _container_config(self, image, command, hostname=None, user=None,
 'Image': image,
 'Volumes': volumes,
 'VolumesFrom': volumes_from,
 'Devices': devices,
 'NetworkDisabled': network_disabled,
 'Entrypoint': entrypoint,
 'CpuShares': cpu_shares,
Expand DownExpand Up@@ -449,15 +456,16 @@ def copy(self, container, resource):
 def create_container(self, image, command=None, hostname=None, user=None,
 detach=False, stdin_open=False, tty=False,
 mem_limit=0, ports=None, environment=None, dns=None,
 volumes=None, volumes_from=None,
 volumes=None, volumes_from=None, devices=None,
 network_disabled=False, name=None, entrypoint=None,
 cpu_shares=None, working_dir=None, domainname=None,
 memswap_limit=0):

 config = self._container_config(
 image, command, hostname, user, detach, stdin_open, tty, mem_limit,
 ports, environment, dns, volumes, volumes_from, network_disabled,
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit
 entrypoint, cpu_shares, working_dir, domainname, memswap_limit,
 devices
 )
 return self.create_container_from_config(config, name)

Expand DownExpand Up@@ -748,7 +756,8 @@ def search(self, term):

 def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 publish_all_ports=False, links=None, privileged=False,
 dns=None, dns_search=None, volumes_from=None, network_mode=None):
 dns=None, dns_search=None, volumes_from=None, network_mode=None,
 device_binds=None):
 if isinstance(container, dict):
 container = container.get('Id')

Expand All@@ -769,6 +778,9 @@ def start(self, container, binds=None, port_bindings=None, lxc_conf=None,
 port_bindings
 )

 if device_binds:
 start_config['Devices'] = utils.convert_device_binds(device_binds)

 start_config['PublishAllPorts'] = publish_all_ports

 if links:
Expand Down

14 changes: 14 additions & 0 deletions
fig/packages/docker/utils/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,20 @@ def convert_volume_binds(binds):
 result.append('%s:%s:rw' % (k, v))
 return result

def convert_device_binds(device_binds):
 result = []
 for k, v in device_binds.items():
 device = {}
 if isinstance(v, dict):
 device['CgroupPermissions'] = 'rom' if v.get('rom', False) else 'rwm'
 device['PathOnHost'] = v['bind']
 else:
 device['CgroupPermissions'] = 'rwm'
 device['PathOnHost'] = v
 device['PathInContainer'] = k
 result.append(device)
 return result


def parse_repository_tag(repo):
 column_index = repo.rfind(':')
Expand Down

33 changes: 32 additions & 1 deletion
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,14 +11,15 @@
log = logging.getLogger(__name__)


DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_KEYS = ['image', 'command', 'hostname', 'domainname', 'user', 'detach', 'stdin_open', 'tty', 'mem_limit', 'ports', 'environment', 'dns', 'volumes', 'devices', 'entrypoint', 'privileged', 'volumes_from', 'net', 'working_dir']
DOCKER_CONFIG_HINTS = {
 'link' : 'links',
 'port' : 'ports',
 'privilege' : 'privileged',
 'priviliged': 'privileged',
 'privilige' : 'privileged',
 'volume' : 'volumes',
 'device' : 'devices',
 'workdir' : 'working_dir',
}

Expand DownExpand Up@@ -238,6 +239,22 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 'ro': False,
 }

 device_bindings = {}

 if options.get('devices', None) is not None:
 for device in options['devices']:
 if ':' in device:
 external_device, internal_device = device.split(':')
 device_bindings[os.path.abspath(external_device)] = {
 'bind': internal_device,
 'rom': False,
 }
 else:
 device_bindings[os.path.abspath(device)] = {
 'bind': device,
 'rom': False
 }

 privileged = options.get('privileged', False)
 net = options.get('net', 'bridge')
 dns = options.get('dns', None)
Expand All@@ -246,6 +263,7 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 links=self._get_links(link_to_self=override_options.get('one_off', False)),
 port_bindings=port_bindings,
 binds=volume_bindings,
 device_binds=device_bindings,
 volumes_from=self._get_volumes_from(intermediate_container),
 privileged=privileged,
 network_mode=net,
Expand DownExpand Up@@ -340,6 +358,9 @@ def _get_container_create_options(self, override_options, one_off=False):
 if 'volumes' in container_options:
 container_options['volumes'] = dict((split_volume(v)[1], {}) for v in container_options['volumes'])

 if 'devices' in container_options:
 container_options['devices'] = dict((split_device(v)[1], {}) for v in container_options['devices'])

 if 'environment' in container_options:
 if isinstance(container_options['environment'], list):
 container_options['environment'] = dict(split_env(e) for e in container_options['environment'])
Expand DownExpand Up@@ -443,6 +464,16 @@ def split_volume(v):
 else:
 return (None, v)

def split_device(d):
 """
 If d is of the format EXTERNAL:INTERNAL, returns (EXTERNAL, INTERNAL).
 If d is of the format INTERNAL, returns (None, INTERNAL).
 """
 if ':' in d:
 return d.split(':', 1)
 else:
 return (None, d)


def split_port(port):
 port = str(port)
Expand Down