feat: Always build for both AMD64 and ARM64 architectures

Co-Authored-By: Aaron <AJ> Steers <[email protected]>

Author: devin-ai-integration[bot]

airbyte_cdk/cli/build/_run.py

@@ -43,13 +43,6 @@ def parse_args(args: List[str]) -> argparse.Namespace:
     parser.add_argument(
         "--tag", type=str, default="dev", help="Tag to apply to the built image (default: dev)"
     )
-    parser.add_argument(
-        "--platform",
-        type=str,
-        choices=["linux/amd64", "linux/arm64"],
-        default="linux/amd64",
-        help="Platform to build for (default: linux/amd64)",
-    )
     parser.add_argument(
         "--no-verify", action="store_true", help="Skip verification of the built image"
     )
@@ -178,15 +171,15 @@ def build_from_dockerfile(
     connector_dir: Path,
     metadata: ConnectorMetadata,
     tag: str,
-    platform: str,
+    platforms: str = "linux/amd64,linux/arm64",
 ) -> str:
     """Build a Docker image for the connector using its Dockerfile.
 
     Args:
         connector_dir: Path to the connector directory.
         metadata: The connector metadata.
         tag: The tag to apply to the built image.
-        platform: The platform to build for (e.g., linux/amd64).
+        platforms: The platforms to build for (default: "linux/amd64,linux/arm64").
 
     Returns:
         The full image name with tag.
@@ -202,22 +195,24 @@ def build_from_dockerfile(
     image_name = metadata.dockerRepository
     full_image_name = f"{image_name}:{tag}"
 
-    logger.info(f"Building Docker image from Dockerfile: {full_image_name} for platform {platform}")
+    logger.info(f"Building Docker image from Dockerfile: {full_image_name} for platforms {platforms}")
     logger.warning(
         "Building from Dockerfile is deprecated. Consider using a base image in metadata.yaml."
     )
 
     build_cmd = [
         "docker",
+        "buildx",
         "build",
         "--platform",
-        platform,
+        platforms,
         "-t",
         full_image_name,
         "--label",
         f"io.airbyte.version={metadata.dockerImageTag}",
         "--label",
         f"io.airbyte.name={metadata.dockerRepository}",
+        "--load",  # Load the image into the local Docker daemon
         str(connector_dir),
     ]
 
@@ -234,15 +229,15 @@ def build_from_base_image(
     connector_dir: Path,
     metadata: ConnectorMetadata,
     tag: str,
-    platform: str,
+    platforms: str = "linux/amd64,linux/arm64",
 ) -> str:
     """Build a Docker image for the connector using a base image.
 
     Args:
         connector_dir: Path to the connector directory.
         metadata: The connector metadata.
         tag: The tag to apply to the built image.
-        platform: The platform to build for (e.g., linux/amd64).
+        platforms: The platforms to build for (default: "linux/amd64,linux/arm64").
 
     Returns:
         The full image name with tag.
@@ -259,7 +254,7 @@ def build_from_base_image(
     full_image_name = f"{image_name}:{tag}"
 
     logger.info(
-        f"Building Docker image from base image {base_image}: {full_image_name} for platform {platform}"
+        f"Building Docker image from base image {base_image}: {full_image_name} for platforms {platforms}"
     )
 
     with tempfile.TemporaryDirectory() as temp_dir:
@@ -272,6 +267,8 @@ def build_from_base_image(
 
 COPY . .
 
+RUN pip install .
+
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/{get_main_file_name(connector_dir)}"
 ENTRYPOINT ["python", "/airbyte/integration_code/{get_main_file_name(connector_dir)}"]
 """
@@ -287,15 +284,17 @@ def build_from_base_image(
 
         build_cmd = [
             "docker",
+            "buildx",
             "build",
             "--platform",
-            platform,
+            platforms,
             "-t",
             full_image_name,
             "--label",
             f"io.airbyte.version={metadata.dockerImageTag}",
             "--label",
             f"io.airbyte.name={metadata.dockerRepository}",
+            "--load",  # Load the image into the local Docker daemon
             str(temp_dir_path),
         ]
 
@@ -377,13 +376,16 @@ def run_command(args: List[str]) -> int:
         logger.info(f"Detected connector language: {language}")
 
         try:
+            platforms = "linux/amd64,linux/arm64"
+            logger.info(f"Building for platforms: {platforms}")
+            
             if metadata.connectorBuildOptions and metadata.connectorBuildOptions.baseImage:
                 image_name = build_from_base_image(
-                    connector_dir, metadata, parsed_args.tag, parsed_args.platform
+                    connector_dir, metadata, parsed_args.tag, platforms
                 )
             else:
                 image_name = build_from_dockerfile(
-                    connector_dir, metadata, parsed_args.tag, parsed_args.platform
+                    connector_dir, metadata, parsed_args.tag, platforms
                 )
 
             if not parsed_args.no_verify:

airbyte_cdk/cli/commands/image.py

@@ -27,19 +27,14 @@ def image() -> None:
     "connector_dir", type=click.Path(exists=True, file_okay=False, dir_okay=True, path_type=Path)
 )
 @click.option("--tag", default="dev", help="Tag to apply to the built image (default: dev)")
-@click.option(
-    "--platform",
-    type=click.Choice(["linux/amd64", "linux/arm64"]),
-    default="linux/amd64",
-    help="Platform to build for (default: linux/amd64)",
-)
 @click.option("--no-verify", is_flag=True, help="Skip verification of the built image")
 @click.option("--verbose", "-v", is_flag=True, help="Enable verbose logging")
-def build(connector_dir: Path, tag: str, platform: str, no_verify: bool, verbose: bool) -> None:
+def build(connector_dir: Path, tag: str, no_verify: bool, verbose: bool) -> None:
     """Build a connector Docker image.
 
     This command builds a Docker image for a connector, using either
     the connector's Dockerfile or a base image specified in the metadata.
+    The image is built for both AMD64 and ARM64 architectures.
     """
     set_up_logging(verbose)
 
@@ -56,11 +51,14 @@ def build(connector_dir: Path, tag: str, platform: str, no_verify: bool, verbose
 
         language = infer_connector_language(metadata, connector_dir)
         click.echo(f"Detected connector language: {language}")
+        
+        platforms = "linux/amd64,linux/arm64"
+        click.echo(f"Building for platforms: {platforms}")
 
         if metadata.connectorBuildOptions and metadata.connectorBuildOptions.baseImage:
-            image_name = build_from_base_image(connector_dir, metadata, tag, platform)
+            image_name = build_from_base_image(connector_dir, metadata, tag, platforms)
         else:
-            image_name = build_from_dockerfile(connector_dir, metadata, tag, platform)
+            image_name = build_from_dockerfile(connector_dir, metadata, tag, platforms)
 
         if not no_verify:
             if verify_image(image_name):

docs/cli/build.md

@@ -24,9 +24,6 @@ airbyte-cdk image build /path/to/connector
 # With custom tag
 airbyte-cdk image build /path/to/connector --tag custom_tag
 
-# Build for a specific platform
-airbyte-cdk image build /path/to/connector --platform linux/arm64
-
 # Skip verification
 airbyte-cdk image build /path/to/connector --no-verify
 
@@ -38,7 +35,7 @@ airbyte-cdk image build /path/to/connector --verbose
 
 - `connector_dir`: Path to the connector directory (required)
 - `--tag`: Tag to apply to the built image (default: "dev")
-- `--platform`: Platform to build for (choices: "linux/amd64", "linux/arm64", default: "linux/amd64")
+
 - `--no-verify`: Skip verification of the built image
 - `--verbose`, `-v`: Enable verbose logging