Support custom lambda build images tags

Author: AdamiHamza

Diff for: README.rst

@@ -154,13 +154,13 @@ These are the available arguments:
 |                                +----------+--------------------------------------+------------------------------------------------------------------------------------------+
 |                                | Optional | Default: Random hash                 | Allowed: ``commit`` hash | ``tag`` ver                                                   |
 +--------------------------------+----------+--------------------------------------+------------------------------------------------------------------------------------------+
-| --aws-profile-name             | AWS profile name (if not provided, will use default aws env variables)                                                                     |
+| --build-docker-repo            | Use custom build docker repository (other than lambci/lambda)                                                                              |
 |                                +----------+--------------------------------------+------------------------------------------------------------------------------------------+
-|                                | Optional | Default: None                        | Allowed: existing aws profile name                                                       |
+|                                | Optional | Default: lambci/lambda               | Allowed: a valid docker repo without image tag part                                      |
 +--------------------------------+----------+--------------------------------------+------------------------------------------------------------------------------------------+
-| --watch-log-stream             | Watch lambda log stream in realtime after publishing the function                                                                          |
+| --build-docker-image           | Custom build docker image tag (if not provided, will use build-{[python|node][runtime-version]}) lambci/lambda repo                        |
 |                                +----------+--------------------------------------+------------------------------------------------------------------------------------------+
-|                                | Optional | Default: True                        | Allowed: Boolean                                                                         |
+|                                | Optional | Default: None                        | Allowed: an existing docker image tag                                                    |
 +--------------------------------+----------+--------------------------------------+------------------------------------------------------------------------------------------+
 
 
@@ -172,14 +172,16 @@ Example
     aws-lambda-ci \
     --app-s3-bucket "kodhive-prd-useast1-ippan-core-artifacts" \
     --function-name "useast1-mimoto-api-v1-codeless" \
-    --function-runtime "python3.7" \
+    --function-runtime "python3.11" \
     --function-alias-name "latest" \
     --function-layer-name "useast1-mimoto-api-v1-codeless-deps" \
     --app-src-path "app/api/src" \
     --app-packages-descriptor-path "app/api/src/requirements/lambda.txt" \
     --source-version "1.0.1" \
     --aws-profile-name "kodhive_prd" \
-    --watch-log-stream
+    --watch-log-stream \
+    --build-docker-repo public.ecr.aws/sam/build-python3.11 \
+    --build-docker-image latest
 
 Demos
 ======

Diff for: ci.py

@@ -49,6 +49,9 @@
 parser.add_argument('--build-docker-repo', dest='build_docker_repo', required=False, default="lambci/lambda",
                     help="Use custom lambci/lambda build docker repository")
 
+parser.add_argument('--build-docker-image', dest='build_docker_image', required=False, default=None,
+                    help="Build custom docker image tag (if not provided, will use build-{[python|node][runtime-version]})")
+
 args = parser.parse_args()
 
 # Validation
@@ -108,6 +111,7 @@ def wrapper(*args, **kwargs):
 FUNCTION_REGION = FUNCTION_LATEST_CONFIG["FunctionArn"].split(":")[3]
 FUNCTION_LATEST_VERSION = FUNCTION_LATEST_CONFIG["Version"]
 FUNCTION_LATEST_CODE_SHA = FUNCTION_LATEST_CONFIG["CodeSha256"]
+FUNCTION_LATEST_LAYERS = FUNCTION_LATEST_CONFIG.get("Layers", [])
 FUNCTION_CURRENT_GIT_VERSION = FUNCTION_LATEST_CONFIG["Description"] if FUNCTION_LATEST_CONFIG else "Virgin"
 FUNCTION_LATEST_LAYER_CONFIG = lam.list_layer_versions(LayerName=FUNCTION_LAYER_NAME, MaxItems=1)["LayerVersions"]
 FUNCTION_LATEST_LAYER_VERSION = FUNCTION_LATEST_LAYER_CONFIG[0]["Version"] if FUNCTION_LATEST_LAYER_CONFIG else 0
@@ -142,6 +146,7 @@ def wrapper(*args, **kwargs):
 
 # Build repo
 BUILD_DOCKER_REPO = args.build_docker_repo
+BUILD_DOCKER_IMAGE = args.build_docker_image
 
 COL_BLU = "\033[94m"
 COL_GRN = "\033[92m"
@@ -168,6 +173,10 @@ def build():
     if found_cache:
         deps_changed = application_dependencies_changed()
 
+    # Force Rebuild deps if there is no Layer attached to the lambda
+    if not FUNCTION_LATEST_LAYERS:
+        deps_changed = True
+
     if deps_changed:
         # FETCH/PACKAGE DEPENDENCIES
         fetch_dependencies()
@@ -340,9 +349,13 @@ def npm():
 
 
 def docker_run(install_cmd):
+    if BUILD_DOCKER_IMAGE:
+        image_tag = BUILD_DOCKER_IMAGE
+    else:
+        image_tag = f"build-{FUNCTION_RUNTIME}"
     docker_cmd = (
         "docker", "run", f'-v "{WORKING_DIR}":/var/task',
-        f"--rm {BUILD_DOCKER_REPO}:build-{FUNCTION_RUNTIME}",
+        f"--rm {BUILD_DOCKER_REPO}:{image_tag}",
         f'/bin/sh -c "{install_cmd}"'
     )
     try:
@@ -474,7 +487,7 @@ def ci():
         summary(
             lambda_published_version, layer_published_version or FUNCTION_LATEST_LAYER_VERSION,
             code_changed=code_changed, deps_changed=deps_changed,
-        )
+                                      )
 
 
 # EntryPoint

Diff for: setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="aws-lambda-ci",
-    version="0.0.2",
+    version="0.0.8",
     url="https://github.com/obytes/aws-lambda-ci",
     license="Apache License 2.0",
     author="Hamza Adami",