Skip to content

Allow dependent image pull from insecure registry#562

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

Merged
bfirsh merged 1 commit into from
Oct 22, 2014
Merged

Allow dependent image pull from insecure registry #562

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
43 changes: 27 additions & 16 deletions fig/cli/main.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -264,17 +264,21 @@ def run(self, project, options):
Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]

Options:
-d Detached mode: Run container in the background, print
new container name.
--entrypoint CMD Override the entrypoint of the image.
-e KEY=VAL Set an environment variable (can be used multiple times)
--no-deps Don't start linked services.
--rm Remove container after run. Ignored in detached mode.
-T Disable pseudo-tty allocation. By default `fig run`
allocates a TTY.
--allow-insecure-ssl Allow insecure connections to the docker
registry
-d Detached mode: Run container in the background, print
new container name.
--entrypoint CMD Override the entrypoint of the image.
-e KEY=VAL Set an environment variable (can be used multiple times)
--no-deps Don't start linked services.
--rm Remove container after run. Ignored in detached mode.
-T Disable pseudo-tty allocation. By default `fig run`
allocates a TTY.
"""
service = project.get_service(options['SERVICE'])

insecure_registry = options['--allow-insecure-ssl']

if not options['--no-deps']:
deps = service.get_linked_names()

Expand DownExpand Up@@ -309,8 +313,11 @@ def run(self, project, options):

if options['--entrypoint']:
container_options['entrypoint'] = options.get('--entrypoint')

container = service.create_container(one_off=True, **container_options)
container = service.create_container(
one_off=True,
insecure_registry=insecure_registry,
**container_options
)
if options['-d']:
service.start_container(container, ports=None, one_off=True)
print(container.name)
Expand DownExpand Up@@ -396,12 +403,15 @@ def up(self, project, options):
Usage: up [options] [SERVICE...]

Options:
-d Detached mode: Run containers in the background,
print new container names.
--no-color Produce monochrome output.
--no-deps Don't start linked services.
--no-recreate If containers already exist, don't recreate them.
--allow-insecure-ssl Allow insecure connections to the docker
registry
-d Detached mode: Run containers in the background,
print new container names.
--no-color Produce monochrome output.
--no-deps Don't start linked services.
--no-recreate If containers already exist, don't recreate them.
"""
insecure_registry = options['--allow-insecure-ssl']
detached = options['-d']

monochrome = options['--no-color']
Expand All@@ -413,7 +423,8 @@ def up(self, project, options):
project.up(
service_names=service_names,
start_links=start_links,
recreate=recreate
recreate=recreate,
insecure_registry=insecure_registry,
)

to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
Expand Down
4 changes: 2 additions & 2 deletions fig/project.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,15 +167,15 @@ def build(self, service_names=None, no_cache=False):
else:
log.info('%s uses an image, skipping' % service.name)

def up(self, service_names=None, start_links=True, recreate=True):
def up(self, service_names=None, start_links=True, recreate=True, insecure_registry=False):
running_containers = []

for service in self.get_services(service_names, include_links=start_links):
if recreate:
for (_, container) in service.recreate_containers():
running_containers.append(container)
else:
for container in service.start_or_create_containers():
for container in service.start_or_create_containers(insecure_registry=insecure_registry):
running_containers.append(container)

return running_containers
Expand Down
12 changes: 8 additions & 4 deletions fig/service.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def remove_stopped(self, **options):
log.info("Removing %s..." % c.name)
c.remove(**options)

def create_container(self, one_off=False, **override_options):
def create_container(self, one_off=False, insecure_registry=False, **override_options):
"""
Create a container for this service. If the image doesn't exist, attempt to pull
it.
Expand All@@ -179,7 +179,11 @@ def create_container(self, one_off=False, **override_options):
except APIError as e:
if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
log.info('Pulling image %s...' % container_options['image'])
output = self.client.pull(container_options['image'], stream=True)
output = self.client.pull(
container_options['image'],
stream=True,
insecure_registry=insecure_registry
)
stream_output(output, sys.stdout)
return Container.create(self.client, **container_options)
raise
Expand DownExpand Up@@ -270,12 +274,12 @@ def start_container(self, container=None, intermediate_container=None, **overrid
)
return container

def start_or_create_containers(self):
def start_or_create_containers(self, insecure_registry=False):
containers = self.containers(stopped=True)

if not containers:
log.info("Creating %s..." % self._next_container_name(containers))
new_container = self.create_container()
new_container = self.create_container(insecure_registry=insecure_registry)
return [self.start_container(new_container)]
else:
return [self.start_container_if_stopped(c) for c in containers]
Expand Down
17 changes: 17 additions & 0 deletions tests/unit/service_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@
import mock

import docker
from requests import Response

from fig import Service
from fig.container import Container
Expand All@@ -14,6 +15,7 @@
split_port,
parse_volume_spec,
build_volume_binding,
APIError,
)


Expand DownExpand Up@@ -174,6 +176,21 @@ def test_pull_image(self, mock_log):
self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True)
mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')

@mock.patch('fig.service.log', autospec=True)
def test_create_container_from_insecure_registry(self, mock_log):
service = Service('foo', client=self.mock_client, image='someimage:sometag')
mock_response = mock.Mock(Response)
mock_response.status_code = 404
mock_response.reason = "Not Found"
Container.create = mock.Mock()
Container.create.side_effect = APIError('Mock error', mock_response, "No such image")
try:
service.create_container(insecure_registry=True)
except APIError: # We expect the APIError because our service requires a non-existent image.
pass
self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True, stream=True)
mock_log.info.assert_called_once_with('Pulling image someimage:sometag...')


class ServiceVolumesTest(unittest.TestCase):

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" + '
Allow dependent image pull from insecure registry by tjrivera · Pull Request #562 · docker/compose · GitHub
Skip to content
Allow dependent image pull from insecure registry#562

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

 Merged

bfirsh
merged 1 commit into

from

Oct 22, 2014
 Merged


Allow dependent image pull from insecure registry
#562
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


43 changes: 27 additions & 16 deletions
fig/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,17 +264,21 @@ def run(self, project, options):
 Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]

 Options:
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 """
 service = project.get_service(options['SERVICE'])

 insecure_registry = options['--allow-insecure-ssl']

 if not options['--no-deps']:
 deps = service.get_linked_names()

Expand DownExpand Up@@ -309,8 +313,11 @@ def run(self, project, options):

 if options['--entrypoint']:
 container_options['entrypoint'] = options.get('--entrypoint')

 container = service.create_container(one_off=True, **container_options)
 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )
 if options['-d']:
 service.start_container(container, ports=None, one_off=True)
 print(container.name)
Expand DownExpand Up@@ -396,12 +403,15 @@ def up(self, project, options):
 Usage: up [options] [SERVICE...]

 Options:
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 """
 insecure_registry = options['--allow-insecure-ssl']
 detached = options['-d']

 monochrome = options['--no-color']
Expand All@@ -413,7 +423,8 @@ def up(self, project, options):
 project.up(
 service_names=service_names,
 start_links=start_links,
 recreate=recreate
 recreate=recreate,
 insecure_registry=insecure_registry,
 )

 to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
Expand Down

4 changes: 2 additions & 2 deletions
fig/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,15 +167,15 @@ def build(self, service_names=None, no_cache=False):
 else:
 log.info('%s uses an image, skipping' % service.name)

 def up(self, service_names=None, start_links=True, recreate=True):
 def up(self, service_names=None, start_links=True, recreate=True, insecure_registry=False):
 running_containers = []

 for service in self.get_services(service_names, include_links=start_links):
 if recreate:
 for (_, container) in service.recreate_containers():
 running_containers.append(container)
 else:
 for container in service.start_or_create_containers():
 for container in service.start_or_create_containers(insecure_registry=insecure_registry):
 running_containers.append(container)

 return running_containers
Expand Down

12 changes: 8 additions & 4 deletions
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def remove_stopped(self, **options):
 log.info("Removing %s..." % c.name)
 c.remove(**options)

 def create_container(self, one_off=False, **override_options):
 def create_container(self, one_off=False, insecure_registry=False, **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
Expand All@@ -179,7 +179,11 @@ def create_container(self, one_off=False, **override_options):
 except APIError as e:
 if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
 log.info('Pulling image %s...' % container_options['image'])
 output = self.client.pull(container_options['image'], stream=True)
 output = self.client.pull(
 container_options['image'],
 stream=True,
 insecure_registry=insecure_registry
 )
 stream_output(output, sys.stdout)
 return Container.create(self.client, **container_options)
 raise
Expand DownExpand Up@@ -270,12 +274,12 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 )
 return container

 def start_or_create_containers(self):
 def start_or_create_containers(self, insecure_registry=False):
 containers = self.containers(stopped=True)

 if not containers:
 log.info("Creating %s..." % self._next_container_name(containers))
 new_container = self.create_container()
 new_container = self.create_container(insecure_registry=insecure_registry)
 return [self.start_container(new_container)]
 else:
 return [self.start_container_if_stopped(c) for c in containers]
Expand Down

17 changes: 17 additions & 0 deletions
tests/unit/service_test.py

View file


Open in desktop

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

import docker
from requests import Response

from fig import Service
from fig.container import Container
Expand All@@ -14,6 +15,7 @@
 split_port,
 parse_volume_spec,
 build_volume_binding,
 APIError,
)


Expand DownExpand Up@@ -174,6 +176,21 @@ def test_pull_image(self, mock_log):
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True)
 mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')

 @mock.patch('fig.service.log', autospec=True)
 def test_create_container_from_insecure_registry(self, mock_log):
 service = Service('foo', client=self.mock_client, image='someimage:sometag')
 mock_response = mock.Mock(Response)
 mock_response.status_code = 404
 mock_response.reason = "Not Found"
 Container.create = mock.Mock()
 Container.create.side_effect = APIError('Mock error', mock_response, "No such image")
 try:
 service.create_container(insecure_registry=True)
 except APIError: # We expect the APIError because our service requires a non-existent image.
 pass
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True, stream=True)
 mock_log.info.assert_called_once_with('Pulling image someimage:sometag...')


class ServiceVolumesTest(unittest.TestCase):

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('^' + ".*" + '
Allow dependent image pull from insecure registry by tjrivera · Pull Request #562 · docker/compose · GitHub
Skip to content
Allow dependent image pull from insecure registry#562

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

 Merged

bfirsh
merged 1 commit into

from

Oct 22, 2014
 Merged


Allow dependent image pull from insecure registry
#562
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


43 changes: 27 additions & 16 deletions
fig/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,17 +264,21 @@ def run(self, project, options):
 Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]

 Options:
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 """
 service = project.get_service(options['SERVICE'])

 insecure_registry = options['--allow-insecure-ssl']

 if not options['--no-deps']:
 deps = service.get_linked_names()

Expand DownExpand Up@@ -309,8 +313,11 @@ def run(self, project, options):

 if options['--entrypoint']:
 container_options['entrypoint'] = options.get('--entrypoint')

 container = service.create_container(one_off=True, **container_options)
 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )
 if options['-d']:
 service.start_container(container, ports=None, one_off=True)
 print(container.name)
Expand DownExpand Up@@ -396,12 +403,15 @@ def up(self, project, options):
 Usage: up [options] [SERVICE...]

 Options:
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 """
 insecure_registry = options['--allow-insecure-ssl']
 detached = options['-d']

 monochrome = options['--no-color']
Expand All@@ -413,7 +423,8 @@ def up(self, project, options):
 project.up(
 service_names=service_names,
 start_links=start_links,
 recreate=recreate
 recreate=recreate,
 insecure_registry=insecure_registry,
 )

 to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
Expand Down

4 changes: 2 additions & 2 deletions
fig/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,15 +167,15 @@ def build(self, service_names=None, no_cache=False):
 else:
 log.info('%s uses an image, skipping' % service.name)

 def up(self, service_names=None, start_links=True, recreate=True):
 def up(self, service_names=None, start_links=True, recreate=True, insecure_registry=False):
 running_containers = []

 for service in self.get_services(service_names, include_links=start_links):
 if recreate:
 for (_, container) in service.recreate_containers():
 running_containers.append(container)
 else:
 for container in service.start_or_create_containers():
 for container in service.start_or_create_containers(insecure_registry=insecure_registry):
 running_containers.append(container)

 return running_containers
Expand Down

12 changes: 8 additions & 4 deletions
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def remove_stopped(self, **options):
 log.info("Removing %s..." % c.name)
 c.remove(**options)

 def create_container(self, one_off=False, **override_options):
 def create_container(self, one_off=False, insecure_registry=False, **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
Expand All@@ -179,7 +179,11 @@ def create_container(self, one_off=False, **override_options):
 except APIError as e:
 if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
 log.info('Pulling image %s...' % container_options['image'])
 output = self.client.pull(container_options['image'], stream=True)
 output = self.client.pull(
 container_options['image'],
 stream=True,
 insecure_registry=insecure_registry
 )
 stream_output(output, sys.stdout)
 return Container.create(self.client, **container_options)
 raise
Expand DownExpand Up@@ -270,12 +274,12 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 )
 return container

 def start_or_create_containers(self):
 def start_or_create_containers(self, insecure_registry=False):
 containers = self.containers(stopped=True)

 if not containers:
 log.info("Creating %s..." % self._next_container_name(containers))
 new_container = self.create_container()
 new_container = self.create_container(insecure_registry=insecure_registry)
 return [self.start_container(new_container)]
 else:
 return [self.start_container_if_stopped(c) for c in containers]
Expand Down

17 changes: 17 additions & 0 deletions
tests/unit/service_test.py

View file


Open in desktop

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

import docker
from requests import Response

from fig import Service
from fig.container import Container
Expand All@@ -14,6 +15,7 @@
 split_port,
 parse_volume_spec,
 build_volume_binding,
 APIError,
)


Expand DownExpand Up@@ -174,6 +176,21 @@ def test_pull_image(self, mock_log):
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True)
 mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')

 @mock.patch('fig.service.log', autospec=True)
 def test_create_container_from_insecure_registry(self, mock_log):
 service = Service('foo', client=self.mock_client, image='someimage:sometag')
 mock_response = mock.Mock(Response)
 mock_response.status_code = 404
 mock_response.reason = "Not Found"
 Container.create = mock.Mock()
 Container.create.side_effect = APIError('Mock error', mock_response, "No such image")
 try:
 service.create_container(insecure_registry=True)
 except APIError: # We expect the APIError because our service requires a non-existent image.
 pass
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True, stream=True)
 mock_log.info.assert_called_once_with('Pulling image someimage:sometag...')


class ServiceVolumesTest(unittest.TestCase):

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('^' + ".*" + '
Allow dependent image pull from insecure registry by tjrivera · Pull Request #562 · docker/compose · GitHub
Skip to content
Allow dependent image pull from insecure registry#562

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

 Merged

bfirsh
merged 1 commit into

from

Oct 22, 2014
 Merged


Allow dependent image pull from insecure registry
#562
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


43 changes: 27 additions & 16 deletions
fig/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,17 +264,21 @@ def run(self, project, options):
 Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]

 Options:
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 """
 service = project.get_service(options['SERVICE'])

 insecure_registry = options['--allow-insecure-ssl']

 if not options['--no-deps']:
 deps = service.get_linked_names()

Expand DownExpand Up@@ -309,8 +313,11 @@ def run(self, project, options):

 if options['--entrypoint']:
 container_options['entrypoint'] = options.get('--entrypoint')

 container = service.create_container(one_off=True, **container_options)
 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )
 if options['-d']:
 service.start_container(container, ports=None, one_off=True)
 print(container.name)
Expand DownExpand Up@@ -396,12 +403,15 @@ def up(self, project, options):
 Usage: up [options] [SERVICE...]

 Options:
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 """
 insecure_registry = options['--allow-insecure-ssl']
 detached = options['-d']

 monochrome = options['--no-color']
Expand All@@ -413,7 +423,8 @@ def up(self, project, options):
 project.up(
 service_names=service_names,
 start_links=start_links,
 recreate=recreate
 recreate=recreate,
 insecure_registry=insecure_registry,
 )

 to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
Expand Down

4 changes: 2 additions & 2 deletions
fig/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,15 +167,15 @@ def build(self, service_names=None, no_cache=False):
 else:
 log.info('%s uses an image, skipping' % service.name)

 def up(self, service_names=None, start_links=True, recreate=True):
 def up(self, service_names=None, start_links=True, recreate=True, insecure_registry=False):
 running_containers = []

 for service in self.get_services(service_names, include_links=start_links):
 if recreate:
 for (_, container) in service.recreate_containers():
 running_containers.append(container)
 else:
 for container in service.start_or_create_containers():
 for container in service.start_or_create_containers(insecure_registry=insecure_registry):
 running_containers.append(container)

 return running_containers
Expand Down

12 changes: 8 additions & 4 deletions
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def remove_stopped(self, **options):
 log.info("Removing %s..." % c.name)
 c.remove(**options)

 def create_container(self, one_off=False, **override_options):
 def create_container(self, one_off=False, insecure_registry=False, **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
Expand All@@ -179,7 +179,11 @@ def create_container(self, one_off=False, **override_options):
 except APIError as e:
 if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
 log.info('Pulling image %s...' % container_options['image'])
 output = self.client.pull(container_options['image'], stream=True)
 output = self.client.pull(
 container_options['image'],
 stream=True,
 insecure_registry=insecure_registry
 )
 stream_output(output, sys.stdout)
 return Container.create(self.client, **container_options)
 raise
Expand DownExpand Up@@ -270,12 +274,12 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 )
 return container

 def start_or_create_containers(self):
 def start_or_create_containers(self, insecure_registry=False):
 containers = self.containers(stopped=True)

 if not containers:
 log.info("Creating %s..." % self._next_container_name(containers))
 new_container = self.create_container()
 new_container = self.create_container(insecure_registry=insecure_registry)
 return [self.start_container(new_container)]
 else:
 return [self.start_container_if_stopped(c) for c in containers]
Expand Down

17 changes: 17 additions & 0 deletions
tests/unit/service_test.py

View file


Open in desktop

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

import docker
from requests import Response

from fig import Service
from fig.container import Container
Expand All@@ -14,6 +15,7 @@
 split_port,
 parse_volume_spec,
 build_volume_binding,
 APIError,
)


Expand DownExpand Up@@ -174,6 +176,21 @@ def test_pull_image(self, mock_log):
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True)
 mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')

 @mock.patch('fig.service.log', autospec=True)
 def test_create_container_from_insecure_registry(self, mock_log):
 service = Service('foo', client=self.mock_client, image='someimage:sometag')
 mock_response = mock.Mock(Response)
 mock_response.status_code = 404
 mock_response.reason = "Not Found"
 Container.create = mock.Mock()
 Container.create.side_effect = APIError('Mock error', mock_response, "No such image")
 try:
 service.create_container(insecure_registry=True)
 except APIError: # We expect the APIError because our service requires a non-existent image.
 pass
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True, stream=True)
 mock_log.info.assert_called_once_with('Pulling image someimage:sometag...')


class ServiceVolumesTest(unittest.TestCase):

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" + '
Allow dependent image pull from insecure registry by tjrivera · Pull Request #562 · docker/compose · GitHub
Skip to content
Allow dependent image pull from insecure registry#562

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

 Merged

bfirsh
merged 1 commit into

from

Oct 22, 2014
 Merged


Allow dependent image pull from insecure registry
#562
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


43 changes: 27 additions & 16 deletions
fig/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,17 +264,21 @@ def run(self, project, options):
 Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]

 Options:
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 """
 service = project.get_service(options['SERVICE'])

 insecure_registry = options['--allow-insecure-ssl']

 if not options['--no-deps']:
 deps = service.get_linked_names()

Expand DownExpand Up@@ -309,8 +313,11 @@ def run(self, project, options):

 if options['--entrypoint']:
 container_options['entrypoint'] = options.get('--entrypoint')

 container = service.create_container(one_off=True, **container_options)
 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )
 if options['-d']:
 service.start_container(container, ports=None, one_off=True)
 print(container.name)
Expand DownExpand Up@@ -396,12 +403,15 @@ def up(self, project, options):
 Usage: up [options] [SERVICE...]

 Options:
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 """
 insecure_registry = options['--allow-insecure-ssl']
 detached = options['-d']

 monochrome = options['--no-color']
Expand All@@ -413,7 +423,8 @@ def up(self, project, options):
 project.up(
 service_names=service_names,
 start_links=start_links,
 recreate=recreate
 recreate=recreate,
 insecure_registry=insecure_registry,
 )

 to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
Expand Down

4 changes: 2 additions & 2 deletions
fig/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,15 +167,15 @@ def build(self, service_names=None, no_cache=False):
 else:
 log.info('%s uses an image, skipping' % service.name)

 def up(self, service_names=None, start_links=True, recreate=True):
 def up(self, service_names=None, start_links=True, recreate=True, insecure_registry=False):
 running_containers = []

 for service in self.get_services(service_names, include_links=start_links):
 if recreate:
 for (_, container) in service.recreate_containers():
 running_containers.append(container)
 else:
 for container in service.start_or_create_containers():
 for container in service.start_or_create_containers(insecure_registry=insecure_registry):
 running_containers.append(container)

 return running_containers
Expand Down

12 changes: 8 additions & 4 deletions
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def remove_stopped(self, **options):
 log.info("Removing %s..." % c.name)
 c.remove(**options)

 def create_container(self, one_off=False, **override_options):
 def create_container(self, one_off=False, insecure_registry=False, **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
Expand All@@ -179,7 +179,11 @@ def create_container(self, one_off=False, **override_options):
 except APIError as e:
 if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
 log.info('Pulling image %s...' % container_options['image'])
 output = self.client.pull(container_options['image'], stream=True)
 output = self.client.pull(
 container_options['image'],
 stream=True,
 insecure_registry=insecure_registry
 )
 stream_output(output, sys.stdout)
 return Container.create(self.client, **container_options)
 raise
Expand DownExpand Up@@ -270,12 +274,12 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 )
 return container

 def start_or_create_containers(self):
 def start_or_create_containers(self, insecure_registry=False):
 containers = self.containers(stopped=True)

 if not containers:
 log.info("Creating %s..." % self._next_container_name(containers))
 new_container = self.create_container()
 new_container = self.create_container(insecure_registry=insecure_registry)
 return [self.start_container(new_container)]
 else:
 return [self.start_container_if_stopped(c) for c in containers]
Expand Down

17 changes: 17 additions & 0 deletions
tests/unit/service_test.py

View file


Open in desktop

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

import docker
from requests import Response

from fig import Service
from fig.container import Container
Expand All@@ -14,6 +15,7 @@
 split_port,
 parse_volume_spec,
 build_volume_binding,
 APIError,
)


Expand DownExpand Up@@ -174,6 +176,21 @@ def test_pull_image(self, mock_log):
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True)
 mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')

 @mock.patch('fig.service.log', autospec=True)
 def test_create_container_from_insecure_registry(self, mock_log):
 service = Service('foo', client=self.mock_client, image='someimage:sometag')
 mock_response = mock.Mock(Response)
 mock_response.status_code = 404
 mock_response.reason = "Not Found"
 Container.create = mock.Mock()
 Container.create.side_effect = APIError('Mock error', mock_response, "No such image")
 try:
 service.create_container(insecure_registry=True)
 except APIError: # We expect the APIError because our service requires a non-existent image.
 pass
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True, stream=True)
 mock_log.info.assert_called_once_with('Pulling image someimage:sometag...')


class ServiceVolumesTest(unittest.TestCase):

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('^' + ".*" + '
Allow dependent image pull from insecure registry by tjrivera · Pull Request #562 · docker/compose · GitHub
Skip to content
Allow dependent image pull from insecure registry#562

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

 Merged

bfirsh
merged 1 commit into

from

Oct 22, 2014
 Merged


Allow dependent image pull from insecure registry
#562
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


43 changes: 27 additions & 16 deletions
fig/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,17 +264,21 @@ def run(self, project, options):
 Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]

 Options:
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 """
 service = project.get_service(options['SERVICE'])

 insecure_registry = options['--allow-insecure-ssl']

 if not options['--no-deps']:
 deps = service.get_linked_names()

Expand DownExpand Up@@ -309,8 +313,11 @@ def run(self, project, options):

 if options['--entrypoint']:
 container_options['entrypoint'] = options.get('--entrypoint')

 container = service.create_container(one_off=True, **container_options)
 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )
 if options['-d']:
 service.start_container(container, ports=None, one_off=True)
 print(container.name)
Expand DownExpand Up@@ -396,12 +403,15 @@ def up(self, project, options):
 Usage: up [options] [SERVICE...]

 Options:
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 """
 insecure_registry = options['--allow-insecure-ssl']
 detached = options['-d']

 monochrome = options['--no-color']
Expand All@@ -413,7 +423,8 @@ def up(self, project, options):
 project.up(
 service_names=service_names,
 start_links=start_links,
 recreate=recreate
 recreate=recreate,
 insecure_registry=insecure_registry,
 )

 to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
Expand Down

4 changes: 2 additions & 2 deletions
fig/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,15 +167,15 @@ def build(self, service_names=None, no_cache=False):
 else:
 log.info('%s uses an image, skipping' % service.name)

 def up(self, service_names=None, start_links=True, recreate=True):
 def up(self, service_names=None, start_links=True, recreate=True, insecure_registry=False):
 running_containers = []

 for service in self.get_services(service_names, include_links=start_links):
 if recreate:
 for (_, container) in service.recreate_containers():
 running_containers.append(container)
 else:
 for container in service.start_or_create_containers():
 for container in service.start_or_create_containers(insecure_registry=insecure_registry):
 running_containers.append(container)

 return running_containers
Expand Down

12 changes: 8 additions & 4 deletions
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def remove_stopped(self, **options):
 log.info("Removing %s..." % c.name)
 c.remove(**options)

 def create_container(self, one_off=False, **override_options):
 def create_container(self, one_off=False, insecure_registry=False, **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
Expand All@@ -179,7 +179,11 @@ def create_container(self, one_off=False, **override_options):
 except APIError as e:
 if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
 log.info('Pulling image %s...' % container_options['image'])
 output = self.client.pull(container_options['image'], stream=True)
 output = self.client.pull(
 container_options['image'],
 stream=True,
 insecure_registry=insecure_registry
 )
 stream_output(output, sys.stdout)
 return Container.create(self.client, **container_options)
 raise
Expand DownExpand Up@@ -270,12 +274,12 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 )
 return container

 def start_or_create_containers(self):
 def start_or_create_containers(self, insecure_registry=False):
 containers = self.containers(stopped=True)

 if not containers:
 log.info("Creating %s..." % self._next_container_name(containers))
 new_container = self.create_container()
 new_container = self.create_container(insecure_registry=insecure_registry)
 return [self.start_container(new_container)]
 else:
 return [self.start_container_if_stopped(c) for c in containers]
Expand Down

17 changes: 17 additions & 0 deletions
tests/unit/service_test.py

View file


Open in desktop

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

import docker
from requests import Response

from fig import Service
from fig.container import Container
Expand All@@ -14,6 +15,7 @@
 split_port,
 parse_volume_spec,
 build_volume_binding,
 APIError,
)


Expand DownExpand Up@@ -174,6 +176,21 @@ def test_pull_image(self, mock_log):
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True)
 mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')

 @mock.patch('fig.service.log', autospec=True)
 def test_create_container_from_insecure_registry(self, mock_log):
 service = Service('foo', client=self.mock_client, image='someimage:sometag')
 mock_response = mock.Mock(Response)
 mock_response.status_code = 404
 mock_response.reason = "Not Found"
 Container.create = mock.Mock()
 Container.create.side_effect = APIError('Mock error', mock_response, "No such image")
 try:
 service.create_container(insecure_registry=True)
 except APIError: # We expect the APIError because our service requires a non-existent image.
 pass
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True, stream=True)
 mock_log.info.assert_called_once_with('Pulling image someimage:sometag...')


class ServiceVolumesTest(unittest.TestCase):

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('^' + ".*" + '
Allow dependent image pull from insecure registry by tjrivera · Pull Request #562 · docker/compose · GitHub
Skip to content
Allow dependent image pull from insecure registry#562

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

 Merged

bfirsh
merged 1 commit into

from

Oct 22, 2014
 Merged


Allow dependent image pull from insecure registry
#562
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


43 changes: 27 additions & 16 deletions
fig/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,17 +264,21 @@ def run(self, project, options):
 Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]

 Options:
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 """
 service = project.get_service(options['SERVICE'])

 insecure_registry = options['--allow-insecure-ssl']

 if not options['--no-deps']:
 deps = service.get_linked_names()

Expand DownExpand Up@@ -309,8 +313,11 @@ def run(self, project, options):

 if options['--entrypoint']:
 container_options['entrypoint'] = options.get('--entrypoint')

 container = service.create_container(one_off=True, **container_options)
 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )
 if options['-d']:
 service.start_container(container, ports=None, one_off=True)
 print(container.name)
Expand DownExpand Up@@ -396,12 +403,15 @@ def up(self, project, options):
 Usage: up [options] [SERVICE...]

 Options:
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 """
 insecure_registry = options['--allow-insecure-ssl']
 detached = options['-d']

 monochrome = options['--no-color']
Expand All@@ -413,7 +423,8 @@ def up(self, project, options):
 project.up(
 service_names=service_names,
 start_links=start_links,
 recreate=recreate
 recreate=recreate,
 insecure_registry=insecure_registry,
 )

 to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
Expand Down

4 changes: 2 additions & 2 deletions
fig/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,15 +167,15 @@ def build(self, service_names=None, no_cache=False):
 else:
 log.info('%s uses an image, skipping' % service.name)

 def up(self, service_names=None, start_links=True, recreate=True):
 def up(self, service_names=None, start_links=True, recreate=True, insecure_registry=False):
 running_containers = []

 for service in self.get_services(service_names, include_links=start_links):
 if recreate:
 for (_, container) in service.recreate_containers():
 running_containers.append(container)
 else:
 for container in service.start_or_create_containers():
 for container in service.start_or_create_containers(insecure_registry=insecure_registry):
 running_containers.append(container)

 return running_containers
Expand Down

12 changes: 8 additions & 4 deletions
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def remove_stopped(self, **options):
 log.info("Removing %s..." % c.name)
 c.remove(**options)

 def create_container(self, one_off=False, **override_options):
 def create_container(self, one_off=False, insecure_registry=False, **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
Expand All@@ -179,7 +179,11 @@ def create_container(self, one_off=False, **override_options):
 except APIError as e:
 if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
 log.info('Pulling image %s...' % container_options['image'])
 output = self.client.pull(container_options['image'], stream=True)
 output = self.client.pull(
 container_options['image'],
 stream=True,
 insecure_registry=insecure_registry
 )
 stream_output(output, sys.stdout)
 return Container.create(self.client, **container_options)
 raise
Expand DownExpand Up@@ -270,12 +274,12 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 )
 return container

 def start_or_create_containers(self):
 def start_or_create_containers(self, insecure_registry=False):
 containers = self.containers(stopped=True)

 if not containers:
 log.info("Creating %s..." % self._next_container_name(containers))
 new_container = self.create_container()
 new_container = self.create_container(insecure_registry=insecure_registry)
 return [self.start_container(new_container)]
 else:
 return [self.start_container_if_stopped(c) for c in containers]
Expand Down

17 changes: 17 additions & 0 deletions
tests/unit/service_test.py

View file


Open in desktop

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

import docker
from requests import Response

from fig import Service
from fig.container import Container
Expand All@@ -14,6 +15,7 @@
 split_port,
 parse_volume_spec,
 build_volume_binding,
 APIError,
)


Expand DownExpand Up@@ -174,6 +176,21 @@ def test_pull_image(self, mock_log):
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True)
 mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')

 @mock.patch('fig.service.log', autospec=True)
 def test_create_container_from_insecure_registry(self, mock_log):
 service = Service('foo', client=self.mock_client, image='someimage:sometag')
 mock_response = mock.Mock(Response)
 mock_response.status_code = 404
 mock_response.reason = "Not Found"
 Container.create = mock.Mock()
 Container.create.side_effect = APIError('Mock error', mock_response, "No such image")
 try:
 service.create_container(insecure_registry=True)
 except APIError: # We expect the APIError because our service requires a non-existent image.
 pass
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True, stream=True)
 mock_log.info.assert_called_once_with('Pulling image someimage:sometag...')


class ServiceVolumesTest(unittest.TestCase):

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); }
})();
})();
Allow dependent image pull from insecure registry by tjrivera · Pull Request #562 · docker/compose · GitHub
Skip to content
Allow dependent image pull from insecure registry#562

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

 Merged

bfirsh
merged 1 commit into

from

Oct 22, 2014
 Merged


Allow dependent image pull from insecure registry
#562
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


43 changes: 27 additions & 16 deletions
fig/cli/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -264,17 +264,21 @@ def run(self, project, options):
 Usage: run [options] [-e KEY=VAL...] SERVICE [COMMAND] [ARGS...]

 Options:
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run container in the background, print
 new container name.
 --entrypoint CMD Override the entrypoint of the image.
 -e KEY=VAL Set an environment variable (can be used multiple times)
 --no-deps Don't start linked services.
 --rm Remove container after run. Ignored in detached mode.
 -T Disable pseudo-tty allocation. By default `fig run`
 allocates a TTY.
 """
 service = project.get_service(options['SERVICE'])

 insecure_registry = options['--allow-insecure-ssl']

 if not options['--no-deps']:
 deps = service.get_linked_names()

Expand DownExpand Up@@ -309,8 +313,11 @@ def run(self, project, options):

 if options['--entrypoint']:
 container_options['entrypoint'] = options.get('--entrypoint')

 container = service.create_container(one_off=True, **container_options)
 container = service.create_container(
 one_off=True,
 insecure_registry=insecure_registry,
 **container_options
 )
 if options['-d']:
 service.start_container(container, ports=None, one_off=True)
 print(container.name)
Expand DownExpand Up@@ -396,12 +403,15 @@ def up(self, project, options):
 Usage: up [options] [SERVICE...]

 Options:
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 --allow-insecure-ssl Allow insecure connections to the docker
 registry
 -d Detached mode: Run containers in the background,
 print new container names.
 --no-color Produce monochrome output.
 --no-deps Don't start linked services.
 --no-recreate If containers already exist, don't recreate them.
 """
 insecure_registry = options['--allow-insecure-ssl']
 detached = options['-d']

 monochrome = options['--no-color']
Expand All@@ -413,7 +423,8 @@ def up(self, project, options):
 project.up(
 service_names=service_names,
 start_links=start_links,
 recreate=recreate
 recreate=recreate,
 insecure_registry=insecure_registry,
 )

 to_attach = [c for s in project.get_services(service_names) for c in s.containers()]
Expand Down

4 changes: 2 additions & 2 deletions
fig/project.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -167,15 +167,15 @@ def build(self, service_names=None, no_cache=False):
 else:
 log.info('%s uses an image, skipping' % service.name)

 def up(self, service_names=None, start_links=True, recreate=True):
 def up(self, service_names=None, start_links=True, recreate=True, insecure_registry=False):
 running_containers = []

 for service in self.get_services(service_names, include_links=start_links):
 if recreate:
 for (_, container) in service.recreate_containers():
 running_containers.append(container)
 else:
 for container in service.start_or_create_containers():
 for container in service.start_or_create_containers(insecure_registry=insecure_registry):
 running_containers.append(container)

 return running_containers
Expand Down

12 changes: 8 additions & 4 deletions
fig/service.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -168,7 +168,7 @@ def remove_stopped(self, **options):
 log.info("Removing %s..." % c.name)
 c.remove(**options)

 def create_container(self, one_off=False, **override_options):
 def create_container(self, one_off=False, insecure_registry=False, **override_options):
 """
 Create a container for this service. If the image doesn't exist, attempt to pull
 it.
Expand All@@ -179,7 +179,11 @@ def create_container(self, one_off=False, **override_options):
 except APIError as e:
 if e.response.status_code == 404 and e.explanation and 'No such image' in str(e.explanation):
 log.info('Pulling image %s...' % container_options['image'])
 output = self.client.pull(container_options['image'], stream=True)
 output = self.client.pull(
 container_options['image'],
 stream=True,
 insecure_registry=insecure_registry
 )
 stream_output(output, sys.stdout)
 return Container.create(self.client, **container_options)
 raise
Expand DownExpand Up@@ -270,12 +274,12 @@ def start_container(self, container=None, intermediate_container=None, **overrid
 )
 return container

 def start_or_create_containers(self):
 def start_or_create_containers(self, insecure_registry=False):
 containers = self.containers(stopped=True)

 if not containers:
 log.info("Creating %s..." % self._next_container_name(containers))
 new_container = self.create_container()
 new_container = self.create_container(insecure_registry=insecure_registry)
 return [self.start_container(new_container)]
 else:
 return [self.start_container_if_stopped(c) for c in containers]
Expand Down

17 changes: 17 additions & 0 deletions
tests/unit/service_test.py

View file


Open in desktop

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

import docker
from requests import Response

from fig import Service
from fig.container import Container
Expand All@@ -14,6 +15,7 @@
 split_port,
 parse_volume_spec,
 build_volume_binding,
 APIError,
)


Expand DownExpand Up@@ -174,6 +176,21 @@ def test_pull_image(self, mock_log):
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True)
 mock_log.info.assert_called_once_with('Pulling foo (someimage:sometag)...')

 @mock.patch('fig.service.log', autospec=True)
 def test_create_container_from_insecure_registry(self, mock_log):
 service = Service('foo', client=self.mock_client, image='someimage:sometag')
 mock_response = mock.Mock(Response)
 mock_response.status_code = 404
 mock_response.reason = "Not Found"
 Container.create = mock.Mock()
 Container.create.side_effect = APIError('Mock error', mock_response, "No such image")
 try:
 service.create_container(insecure_registry=True)
 except APIError: # We expect the APIError because our service requires a non-existent image.
 pass
 self.mock_client.pull.assert_called_once_with('someimage:sometag', insecure_registry=True, stream=True)
 mock_log.info.assert_called_once_with('Pulling image someimage:sometag...')


class ServiceVolumesTest(unittest.TestCase):

Expand Down