fix: use user-template to generate dockerfile

bentoctl_lambda/aws_lambda/bentoctl_user_template.j2

@@ -0,0 +1,12 @@
+{% extends bento__dockerfile %}
+{% set bento__home = "/tmp" %}
+{% block SETUP_BENTO_ENTRYPOINT %}
+EXPOSE 3000
+
+RUN --mount=type=cache,mode=0777,target=/root/.cache/pip \
+	pip install awslambdaric==2.0.0 mangum==0.12.3
+
+USER root
+
+ENTRYPOINT [ "/usr/local/bin/python", "-m", "awslambdaric" ]
+{% endblock %}

bentoctl_lambda/create_deployable.py

@@ -1,27 +1,29 @@
 import os
 import shutil
 
+from bentoctl.docker_utils import DOCKERFILE_PATH
+from bentoml._internal.bento.build_config import DockerOptions
+from bentoml._internal.bento.gen import generate_dockerfile
+
 path_to_aws_lambda_files = os.path.join(os.path.dirname(__file__), "./aws_lambda/")
-DOCKERFILE_TEMPLATE = os.path.join(path_to_aws_lambda_files, "Dockerfile.template")
+BENTOML_USER_TEMPLATE = os.path.join(
+    path_to_aws_lambda_files, "bentoctl_user_template.j2"
+)
 APP_FILE = os.path.join(path_to_aws_lambda_files, "app.py")
 
 
-def generate_lambda_deployable(bento_path, bento_metadata, deployable_path):
+def generate_lambda_deployable(bento_path, _, deployable_path):
     # copy bento_bundle to project_path
     shutil.copytree(bento_path, deployable_path)
 
-    # Make docker file with dockerfile template
-    dockerfile = os.path.join(deployable_path, "Dockerfile")
-    with open(DOCKERFILE_TEMPLATE, "r", encoding="utf-8") as f, open(
-        dockerfile, "w"
-    ) as dockerfile:
-        dockerfile_template = f.read()
-        dockerfile.write(
-            dockerfile_template.format(
-                bentoml_version=bento_metadata["bentoml_version"],
-                python_version=bento_metadata["python_version"],
-            )
-        )
+    # Make docker file with user template
+    docker_options_for_lambda = DockerOptions(dockerfile_template=BENTOML_USER_TEMPLATE)
+    dockerfile_generated = generate_dockerfile(
+        docker_options_for_lambda.with_defaults(), use_conda=False
+    )
+    dockerfile = os.path.join(deployable_path, DOCKERFILE_PATH)
+    with open(dockerfile, "w") as dockerfile:
+        dockerfile.write(dockerfile_generated)
 
     # copy over app.py file
     shutil.copy(
@@ -48,33 +50,25 @@ def create_deployable(
 
     Returns
     -------
-    dockerfile_path : str
-        path to the dockerfile.
     docker_context_path : str
         path to the docker context.
-    additional_build_args : dict
-        Any addition build arguments that need to be passed to the
-        docker build command
     """
 
     deployable_path = os.path.join(destination_dir, "bentoctl_deployable")
     docker_context_path = deployable_path
-    dockerfile_path = os.path.join(deployable_path, "Dockerfile")
 
     if os.path.exists(deployable_path):
         if overwrite_deployable:
             print(f"Overwriting existing deployable [{deployable_path}]")
             shutil.rmtree(deployable_path)
         else:
             print("Using existing deployable")
-            return dockerfile_path, docker_context_path, additional_build_args
+            return docker_context_path
 
     generate_lambda_deployable(
         bento_path=bento_path,
         bento_metadata=bento_metadata,
         deployable_path=deployable_path,
     )
 
-    additional_build_args = None
-
-    return dockerfile_path, docker_context_path, additional_build_args
+    return docker_context_path