@@ -70,7 +70,7 @@ def run(command, cwd=None, input=None):
70
70
@click .option ('-r' , '--rebuild' , is_flag = True , help = 'Ignore docker image caches (i.e. rebuild).' )
71
71
@click .option ('-a' , '--all' , is_flag = True , help = 'Build and/or push all images in manifest.' )
72
72
@click .option ('-v' , '--verbose' , is_flag = True , help = 'Be verbose.' )
73
- @click .option ('-b' , '- -boring' , is_flag = True , help = 'Be boring -- no progress bar.' )
73
+ @click .option ('--boring' , is_flag = True , help = 'Be boring -- no progress bar.' )
74
74
@click .argument ('imagenames' , type = str , nargs = - 1 )
75
75
def build_cargo (manifest : str , do_list = False , build = False , push = False , all = False , rebuild = False , boring = False , verbose = False , imagenames : List [str ] = []):
76
76
if not (build or push or do_list ):
@@ -82,7 +82,7 @@ def build_cargo(manifest: str, do_list=False, build=False, push=False, all=False
82
82
"{task.description}" ,
83
83
console = console , disable = boring ) as progress :
84
84
print = progress .console .print
85
-
85
+
86
86
progress_task = progress .add_task ("loading manifest" )
87
87
88
88
print (Rule (f"Loading manifest { manifest } " ))
@@ -295,7 +295,7 @@ def resolve_config_reference(value):
295
295
if verbose :
296
296
print (f"Dockerfile:" , style = "bold" )
297
297
print (f"{ content } " , style = "dim" , highlight = True )
298
- run (f"docker build { no_cache } -t { full_image } -" , cwd = build_dir , input = content )
298
+ run (f"docker build { no_cache } -t { full_image } -f- { build_dir } " , cwd = build_dir , input = content )
299
299
# is this the latest version that needs to be tagged
300
300
if image_version == tag_latest .get (image ):
301
301
run (f"docker tag { registry } /{ image } :{ image_version } { registry } /{ image } :{ BUNDLE_VERSION } " )
0 commit comments