chore(ci): add base image build step to release workflow

Author: skunxicat

.github/workflows/release.yml

@@ -44,9 +44,18 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Build Docker images
-        run: |
+        run: |              
           echo "${{ secrets.GHCR_PAT }}" > github_token
           export DOCKER_BUILDKIT=1
+
+          docker buildx build --builder shell-runtime-builder --platform linux/arm64 \
+            --build-arg HTTP_CLI_VERSION=${{ env.HTTP_CLI_VERSION }} \
+            --output type=docker --progress=plain \
+            --secret id=github_token,src=github_token \
+            --cache-from type=local,src=/tmp/.buildx-cache \
+            --cache-to type=local,dest=/tmp/.buildx-cache \
+            -t lambda-shell-runtime:base -f base.Dockerfile .
+
           docker buildx build --builder shell-runtime-builder --platform linux/arm64 \
             --build-arg HTTP_CLI_VERSION=${{ env.HTTP_CLI_VERSION }} \
             --output type=docker --progress=plain \

Dockerfile

@@ -1,40 +1,7 @@
-# Stage 1: Build stage
-FROM public.ecr.aws/lambda/provided:al2023 AS builder
-
-ARG HTTP_CLI_VERSION=v1.0.1
-
-RUN dnf install -y unzip && \
-    dnf clean all
-
-# Download http-cli
-RUN --mount=type=secret,id=github_token \
-    curl -H "Authorization: token $(cat /run/secrets/github_token)" \
-    -L "https://github.com/ql4b/http-cli/archive/refs/tags/${HTTP_CLI_VERSION}.zip" \
-    -o http-cli.zip && \
-    unzip http-cli.zip && \
-    mkdir -p /http-cli-bin && \
-    mv http-cli-${HTTP_CLI_VERSION#v}/http-cli /http-cli-bin/ && \
-    chmod +x /http-cli-bin/http-cli && \
-    rm -rf http-cli.zip http-cli-${HTTP_CLI_VERSION#v}
-
-
-    FROM public.ecr.aws/lambda/provided:al2023
+FROM lamda-shell-runtime:tiny
 
 RUN dnf install -y \
     jq \
     aws-cli  && \
     dnf clean all && \
     rm -rf /var/cache/dnf
-
-# Copy http-cli
-COPY --from=builder /http-cli-bin/http-cli /var/task/bin/http-cli
-
-ENV PATH="/var/task/bin:${PATH}"
-
-COPY runtime/bootstrap /var/runtime/bootstrap
-RUN chmod +x /var/runtime/bootstrap
-
-WORKDIR /var/task
-
-COPY task/handler.sh handler.sh
-COPY task/helpers.sh helpers.sh

base.Dockerfile

@@ -0,0 +1,38 @@
+FROM public.ecr.aws/lambda/provided:al2023 AS builder
+
+ARG HTTP_CLI_VERSION=v1.0.1
+
+RUN dnf install -y unzip && \
+    dnf clean all
+
+# Download http-cli
+RUN --mount=type=secret,id=github_token \
+    curl -H "Authorization: token $(cat /run/secrets/github_token)" \
+    -L "https://github.com/ql4b/http-cli/archive/refs/tags/${HTTP_CLI_VERSION}.zip" \
+    -o http-cli.zip && \
+    unzip http-cli.zip && \
+    mkdir -p /http-cli-bin && \
+    mv http-cli-${HTTP_CLI_VERSION#v}/http-cli /http-cli-bin/ && \
+    chmod +x /http-cli-bin/http-cli && \
+    rm -rf http-cli.zip http-cli-${HTTP_CLI_VERSION#v}
+
+FROM public.ecr.aws/lambda/provided:al2023 AS base
+
+# Install only runtime dependencies
+RUN dnf install -y jq && \
+    dnf clean all && \
+    rm -rf /var/cache/dnf
+
+# Copy http-cli
+COPY --from=builder /http-cli-bin/http-cli /var/task/bin/http-cli
+ENV PATH="/var/task/bin:${PATH}"
+
+COPY runtime/bootstrap /var/runtime/bootstrap
+RUN chmod +x /var/runtime/bootstrap
+
+WORKDIR /var/task
+
+COPY task/handler.sh handler.sh
+
+# Label for documentation/reference
+LABEL org.opencontainers.image.title="lambda-shell-runtime:base"

build

@@ -1,13 +1,13 @@
 
 #!/bin/sh
 
-set -e
+set -ex
 
 # Default config
 PLATFORM="linux/arm64"
 MODE="--load"
 TAG="lambda-shell-runtime"
-VARIANTS="tiny micro full"
+VARIANTS="base tiny micro full"
 
 # Parse arguments
 while [ $# -gt 0 ]; do
@@ -28,7 +28,7 @@ while [ $# -gt 0 ]; do
       MODE="--load"
       shift
       ;;
-    tiny|slim|full)
+    full|tiny|micro|base)
       VARIANTS="$1"
       shift
       ;;
@@ -43,6 +43,8 @@ for VARIANT in $VARIANTS; do
   DOCKERFILE="./${VARIANT}.Dockerfile"
   [ "$VARIANT" = "full" ] && DOCKERFILE="./Dockerfile"
 
+  [ "$VARIANT" = "base" ] && MODE="--load"
+
   echo "Building $VARIANT ($DOCKERFILE) with platform $PLATFORM..."
   docker buildx build \
     --platform "$PLATFORM" \

micro.Dockerfile

@@ -1,28 +1,15 @@
 FROM public.ecr.aws/lambda/provided:al2023 AS builder
 
-ARG HTTP_CLI_VERSION=v1.0.1
-
 RUN dnf install -y unzip python3-pip  findutils && \
     dnf clean all
 
-# Download http-cli
-RUN --mount=type=secret,id=github_token \
-    curl -H "Authorization: token $(cat /run/secrets/github_token)" \
-    -L "https://github.com/ql4b/http-cli/archive/refs/tags/${HTTP_CLI_VERSION}.zip" \
-    -o http-cli.zip && \
-    unzip http-cli.zip && \
-    mkdir -p /http-cli-bin && \
-    mv http-cli-${HTTP_CLI_VERSION#v}/http-cli /http-cli-bin/ && \
-    chmod +x /http-cli-bin/http-cli && \
-    rm -rf http-cli.zip http-cli-${HTTP_CLI_VERSION#v}
-
 RUN pip3 install --no-cache-dir --target /tmp/awscurl awscurl && \
     find /tmp/awscurl -type d -name '__pycache__' -exec rm -rf {} + && \
     find /tmp/awscurl -type f -name '*.pyc' -delete && \
     find /tmp/awscurl -type d -name '*.dist-info' -exec rm -rf {} +
 
 # Stage 2: Runtime stage
-FROM public.ecr.aws/lambda/provided:al2023
+FROM lambda-shell-runtime:tiny AS micro
 
 # Install only runtime dependencies
 RUN dnf install -y jq python3 && \
@@ -43,14 +30,4 @@ RUN mkdir -p /var/task/bin && \
     printf '#!/bin/sh\nexport PYTHONPATH=/var/task/aws\nexec python3 -m awscurl.awscurl "$@"\n' > /var/task/bin/awscurl && \
     chmod +x /var/task/bin/awscurl
 
-# Copy http-cli
-COPY --from=builder /http-cli-bin/http-cli /var/task/bin/http-cli
-ENV PATH="/var/task/bin:${PATH}"
-
-COPY runtime/bootstrap /var/runtime/bootstrap
-RUN chmod +x /var/runtime/bootstrap
-
-WORKDIR /var/task
-
-COPY task/handler.sh handler.sh
-COPY task/helpers.sh helpers.sh
+LABEL org.opencontainers.image.title="lambda-shell-runtime:micro"

tiny.Dockerfile

@@ -1,37 +1,5 @@
-FROM public.ecr.aws/lambda/provided:al2023 AS builder
+FROM lambda-shell-runtime:base AS tiny
 
-ARG HTTP_CLI_VERSION=v1.0.1
-
-RUN dnf install -y unzip && \
-    dnf clean all
-
-# Download http-cli
-RUN --mount=type=secret,id=github_token \
-    curl -H "Authorization: token $(cat /run/secrets/github_token)" \
-    -L "https://github.com/ql4b/http-cli/archive/refs/tags/${HTTP_CLI_VERSION}.zip" \
-    -o http-cli.zip && \
-    unzip http-cli.zip && \
-    mkdir -p /http-cli-bin && \
-    mv http-cli-${HTTP_CLI_VERSION#v}/http-cli /http-cli-bin/ && \
-    chmod +x /http-cli-bin/http-cli && \
-    rm -rf http-cli.zip http-cli-${HTTP_CLI_VERSION#v}
-
-# Stage 2: Runtime stage
-FROM public.ecr.aws/lambda/provided:al2023
-
-# Install only runtime dependencies
-RUN dnf install -y jq && \
-    dnf clean all && \
-    rm -rf /var/cache/dnf
-
-# Copy http-cli
-COPY --from=builder /http-cli-bin/http-cli /var/task/bin/http-cli
-ENV PATH="/var/task/bin:${PATH}"
-
-COPY runtime/bootstrap /var/runtime/bootstrap
-RUN chmod +x /var/runtime/bootstrap
-
-WORKDIR /var/task
-
-COPY task/handler.sh handler.sh
 COPY task/helpers.sh helpers.sh
+
+LABEL org.opencontainers.image.title="lambda-shell-runtime:tiny"