Merge "Remove no-cache option in build.py"
This commit is contained in:
commit
c57642f649
@ -92,8 +92,6 @@ _CLI_OPTS = [
|
|||||||
cfg.BoolOpt('cache', default=True,
|
cfg.BoolOpt('cache', default=True,
|
||||||
help='Use the Docker cache when building',
|
help='Use the Docker cache when building',
|
||||||
),
|
),
|
||||||
cfg.BoolOpt('no-cache', default=False,
|
|
||||||
help='Do not use the Docker cache when building'),
|
|
||||||
cfg.MultiOpt('profile', types.String(), short='p',
|
cfg.MultiOpt('profile', types.String(), short='p',
|
||||||
help=('Build a pre-defined set of images, see [profiles]'
|
help=('Build a pre-defined set of images, see [profiles]'
|
||||||
' section in config. The default profiles are:'
|
' section in config. The default profiles are:'
|
||||||
|
@ -247,7 +247,7 @@ class BuildTask(DockerTask):
|
|||||||
self.conf = conf
|
self.conf = conf
|
||||||
self.image = image
|
self.image = image
|
||||||
self.push_queue = push_queue
|
self.push_queue = push_queue
|
||||||
self.nocache = not conf.cache or conf.no_cache
|
self.nocache = not conf.cache
|
||||||
self.forcerm = not conf.keep
|
self.forcerm = not conf.keep
|
||||||
self.logger = image.logger
|
self.logger = image.logger
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user