Skip to content

Commit 389aa3d

Browse files
committed
removed -b from boring. Added image dir to Docker build context. Ready for release
1 parent 41bcee8 commit 389aa3d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cultcargo/builder/build_cargo.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def run(command, cwd=None, input=None):
7070
@click.option('-r', '--rebuild', is_flag=True, help='Ignore docker image caches (i.e. rebuild).')
7171
@click.option('-a', '--all', is_flag=True, help='Build and/or push all images in manifest.')
7272
@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.')
7474
@click.argument('imagenames', type=str, nargs=-1)
7575
def build_cargo(manifest: str, do_list=False, build=False, push=False, all=False, rebuild=False, boring=False, verbose=False, imagenames: List[str] = []):
7676
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
8282
"{task.description}",
8383
console=console, disable=boring) as progress:
8484
print = progress.console.print
85-
85+
8686
progress_task = progress.add_task("loading manifest")
8787

8888
print(Rule(f"Loading manifest {manifest}"))
@@ -295,7 +295,7 @@ def resolve_config_reference(value):
295295
if verbose:
296296
print(f"Dockerfile:", style="bold")
297297
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)
299299
# is this the latest version that needs to be tagged
300300
if image_version == tag_latest.get(image):
301301
run(f"docker tag {registry}/{image}:{image_version} {registry}/{image}:{BUNDLE_VERSION}")

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "cult-cargo"
3-
version = "0.1.2rc7"
3+
version = "0.1.2"
44
description = "Curated cargo of standard radio astronomy packages for stimela 2.0"
55
authors = ["Oleg Smirnov, Sphesihle Makhathini"]
66
license = "MIT"

0 commit comments

Comments
 (0)