Fixes for CLI -b, -p flags and jinja template for noninteractive …

…mode builds

README.md

@@ -24,6 +24,7 @@
 
 - 😇 **Simplicity**: Make it easy to define and build docker images for ML.
 - 📦 **Best-practices**: Bring best-practices to building docker images for ML -- good base images, multi-stage builds, minimal image sizes, etc.
+- ⚡️ **Fast**: Make it lightning-fast to build and re-build docker images with out-of-the-box caching for apt, conda and pip packages.
 - 🧩 **Modular, Re-usable, Composable**: Define `base`, `dev` and `prod` targets with multi-stage builds, and re-use them wherever possible.
 - 👩‍💻 **Extensible**: Make the YAML / DSL easily hackable and extensible to support the ML ecosystem, as more libraries, drivers, HW vendors, come into the market.
 - ☁️ **Vendor-agnostic**: `agi-pack` is not intended to be built for any specific vendor -- I need this tool for internal purposes, but I decided to build it in the open and keep it simple.

agipack/cli.py

@@ -55,10 +55,10 @@ def generate(
     base_image: str = typer.Option(
         None, "--base", "-b", help="Base image to use for the root/base target.", show_default=False
     ),
-    tag: str = typer.Option("agipack:{target}", "--tag", "-t", help="Image tag f-string.", show_default=True),
-    prod: bool = typer.Option(False, "--prod", "-p", help="Generate a production Dockerfile.", show_default=False),
-    lint: bool = typer.Option(False, "--lint", "-l", help="Lint the generated Dockerfile.", show_default=False),
-    build: bool = typer.Option(False, "--build", "-b", help="Build the Docker image after generating the Dockerfile."),
+    tag: str = typer.Option("{name}:{target}", "--tag", "-t", help="Image tag f-string.", show_default=True),
+    prod: bool = typer.Option(False, "--prod", help="Generate a production Dockerfile.", show_default=False),
+    lint: bool = typer.Option(False, "--lint", help="Lint the generated Dockerfile.", show_default=False),
+    build: bool = typer.Option(False, "--build", help="Build the Docker image after generating the Dockerfile."),
 ):
     """Generate the Dockerfile with optional overrides.
 
@@ -87,7 +87,7 @@ def generate(
         image_config = config.images[target]
 
         # Build the Dockerfile using the generated filename and target
-        tag_name = f"{image_config.name}:{target}" if tag is None else tag.format(target=target)
+        tag_name = f"{image_config.name}:{target}" if tag is None else tag.format(name=image_config.name, target=target)
         cmd = f"docker build -f {filename} --target {target} -t {tag_name} ."
         tree = Tree(f"📦 [bold white]{target}[/bold white]")
         tree.add(
@@ -120,9 +120,9 @@ def build(
     base_image: str = typer.Option(
         None, "--base", "-b", help="Base image to use for the root/base target.", show_default=False
     ),
-    tag: str = typer.Option("agipack:{target}", "--tag", "-t", help="Image tag f-string.", show_default=True),
-    prod: bool = typer.Option(False, "--prod", "-p", help="Generate a production Dockerfile.", show_default=False),
-    lint: bool = typer.Option(False, "--lint", "-l", help="Lint the generated Dockerfile.", show_default=False),
+    tag: str = typer.Option("{name}:{target}", "--tag", "-t", help="Image tag f-string.", show_default=True),
+    prod: bool = typer.Option(False, "--prod", help="Generate a production Dockerfile.", show_default=False),
+    lint: bool = typer.Option(False, "--lint", help="Lint the generated Dockerfile.", show_default=False),
 ):
     """Generate the Dockerfile with optional overrides.
 
@@ -132,6 +132,7 @@ def build(
         agi-pack build -c agibuild.yaml -p 3.8.10
         agi-pack build -c agibuild.yaml -b python:3.8.10-slim
         agi-pack build -c agibuild.yaml -t "my-image-name:{target}"
+        agi-pack build -c agibuild.yaml -t "my-image-name:my-target"
         agi-pack build -c agibuild.yaml --prod --lint
     """
     generate(config_filename, filename, python, base_image, tag, prod, lint, build=True)

agipack/templates/Dockerfile.j2

@@ -15,6 +15,7 @@ ENV AGIPACK_PROJECT {{ name }}
 ENV AGIPACK_PYENV {{ name }}-{{ python_alias }}
 ENV AGIPACK_PATH /opt/agi-pack
 
+ENV DEBIAN_FRONTEND="noninteractive"
 ENV PYTHON_VERSION {{ python }}
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
@@ -178,7 +179,8 @@ RUN apt-get -y autoclean \
 
 # Setup environment variables
 {% for key, value in env.items() -%}
-ENV {{ key }}={{ value }} {% endfor %}
+ENV {{ key }}={{ value }} 
+{% endfor %}
 
 {%- endif %}
 

agipack/version.py

@@ -1 +1 @@
-__version__ = "0.1.15"
+__version__ = "0.1.16"