kopia lustrzana https://github.com/jupyterhub/repo2docker
Use --cache-from as arg name to match docker build
rodzic
569e6cf483
commit
89665ea910
|
@ -72,7 +72,7 @@ class Repo2Docker(Application):
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
|
||||||
reuse_layers_from = List(
|
cache_from = List(
|
||||||
[],
|
[],
|
||||||
config=True,
|
config=True,
|
||||||
help="""
|
help="""
|
||||||
|
@ -419,10 +419,10 @@ class Repo2Docker(Application):
|
||||||
)
|
)
|
||||||
|
|
||||||
argparser.add_argument(
|
argparser.add_argument(
|
||||||
'--reuse-layers-from',
|
'--cache-from',
|
||||||
action='append',
|
action='append',
|
||||||
default=[],
|
default=[],
|
||||||
help='Docker images to attempt to re-use cached layers from'
|
help=self.traits()['cache_from'].help
|
||||||
)
|
)
|
||||||
|
|
||||||
return argparser
|
return argparser
|
||||||
|
@ -564,8 +564,8 @@ class Repo2Docker(Application):
|
||||||
if args.subdir:
|
if args.subdir:
|
||||||
self.subdir = args.subdir
|
self.subdir = args.subdir
|
||||||
|
|
||||||
if args.reuse_layers_from:
|
if args.cache_from:
|
||||||
self.reuse_layers_from = args.reuse_layers_from
|
self.cache_from = args.cache_from
|
||||||
|
|
||||||
self.environment = args.environment
|
self.environment = args.environment
|
||||||
|
|
||||||
|
@ -741,7 +741,7 @@ class Repo2Docker(Application):
|
||||||
extra=dict(phase='building'))
|
extra=dict(phase='building'))
|
||||||
|
|
||||||
for l in picked_buildpack.build(self.output_image_spec,
|
for l in picked_buildpack.build(self.output_image_spec,
|
||||||
self.build_memory_limit, build_args, self.reuse_layers_from):
|
self.build_memory_limit, build_args, self.cache_from):
|
||||||
if 'stream' in l:
|
if 'stream' in l:
|
||||||
self.log.info(l['stream'],
|
self.log.info(l['stream'],
|
||||||
extra=dict(phase='building'))
|
extra=dict(phase='building'))
|
||||||
|
|
Ładowanie…
Reference in New Issue