remove java image option

Author: aaronsteers

airbyte_cdk/utils/docker.py

@@ -14,6 +14,7 @@
 from airbyte_cdk.models.connector_metadata import MetadataFile
 from airbyte_cdk.utils.docker_image_templates import (
     DOCKERIGNORE_TEMPLATE,
+    MANIFEST_ONLY_DOCKERFILE_TEMPLATE,
     PYTHON_CONNECTOR_DOCKERFILE_TEMPLATE,
 )
 
@@ -120,7 +121,7 @@ def build_connector_image(
 
     base_image = metadata.data.connectorBuildOptions.baseImage
 
-    dockerfile_path.write_text(PYTHON_CONNECTOR_DOCKERFILE_TEMPLATE)
+    dockerfile_path.write_text(get_dockerfile_template(metadata))
     dockerignore_path.write_text(DOCKERIGNORE_TEMPLATE)
 
     build_args: dict[str, str | None] = {
@@ -165,6 +166,36 @@ def build_connector_image(
         sys.exit(0)
 
 
+def get_dockerfile_template(
+    metadata: MetadataFile,
+) -> str:
+    """Get the Dockerfile template for the connector.
+
+    Args:
+        metadata: The metadata of the connector.
+        connector_name: The name of the connector.
+
+    Returns:
+        The Dockerfile template as a string.
+    """
+    if metadata.data.language == "python":
+        return PYTHON_CONNECTOR_DOCKERFILE_TEMPLATE
+
+    if metadata.data.language == "manifest-only":
+        return MANIFEST_ONLY_DOCKERFILE_TEMPLATE
+
+    if metadata.data.language == "java":
+        raise ValueError(
+            f"Java and Kotlin connectors are not yet supported. "
+            "Please use airbyte-ci or gradle to build your image."
+        )
+
+    raise ValueError(
+        f"Unsupported connector language: {metadata.data.language}. "
+        "Please check the connector's metadata file."
+    )
+
+
 def run_docker_command(
     cmd: list[str],
     *,

airbyte_cdk/utils/docker_image_templates.py

@@ -7,6 +7,10 @@
 These templates are used to generate connector images.
 """
 
+##############################
+## GLOBAL DOCKERIGNORE FILE ##
+##############################
+
 DOCKERIGNORE_TEMPLATE: str = "\n".join(
     [
         "# This file is auto-generated. Do not edit.",
@@ -28,6 +32,10 @@
     ]
 )
 
+###########################
+# PYTHON CONNECTOR IMAGE ##
+###########################
+
 PYTHON_CONNECTOR_DOCKERFILE_TEMPLATE = """
 # syntax=docker/dockerfile:1
 # check=skip=all
@@ -42,7 +50,6 @@
 WORKDIR /airbyte/integration_code
 
 COPY . ./
-COPY ${CONNECTOR_SNAKE_NAME} ./${CONNECTOR_SNAKE_NAME}
 
 # Conditionally copy and execute the extra build script if provided
 RUN if [ -n "${EXTRA_PREREQS_SCRIPT}" ]; then \
@@ -74,23 +81,21 @@
 ENTRYPOINT ["/entrypoint.sh"]
 """
 
+##################################
+# MANIFEST-ONLY CONNECTOR IMAGE ##
+##################################
+
 MANIFEST_ONLY_DOCKERFILE_TEMPLATE = """
 ARG BASE_IMAGE
 ARG CONNECTOR_SNAKE_NAME
 ARG CONNECTOR_KEBAB_NAME
 
-FROM ${BASE_IMAGE} AS builder
+FROM ${BASE_IMAGE}
 
 WORKDIR /airbyte/integration_code
 
 COPY . ./
-COPY --chmod=755 <<EOT /entrypoint.sh
-#!/usr/bin/env bash
-set -e
-
-${CONNECTOR_KEBAB_NAME} "$@"
-EOT
 
-ENV AIRBYTE_ENTRYPOINT="/entrypoint.sh"
-ENTRYPOINT ["/entrypoint.sh"]
+ENV AIRBYTE_ENTRYPOINT="python ./main.py"
+ENTRYPOINT ["python", "./main.py"]
 """