build: use a single Dockerfile for all targets

Author: skunxicat

.github/workflows/release.yml

@@ -43,42 +43,57 @@ jobs:
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
+      - name: Get version from semantic-release
+        id: version
+        run: |
+          VERSION=$(npx semantic-release --dry-run | grep -oP 'The next release version is \K[0-9]+\.[0-9]+\.[0-9]+')
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
       - name: Build Docker images
         run: |              
           echo "${{ secrets.GHCR_PAT }}" > github_token
           export DOCKER_BUILDKIT=1
+          VERSION=$VERSION
+          IMAGE=ghcr.io/ql4b/lambda-shell-runtime
 
           docker buildx build --builder shell-runtime-builder --platform linux/arm64 \
-            --build-arg HTTP_CLI_VERSION=${{ env.HTTP_CLI_VERSION }} \
-            --output type=docker --progress=plain \
+            --build-arg HTTP_CLI_VERSION=$VERSION \
+            --output type=registry --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 .
+            -t $IMAGE:base-$VERSION \
+            -t $IMAGE:base-latest \
+            -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 \
+            --build-arg HTTP_CLI_VERSION=$VERSION \
+            --output type=registry --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:tiny -f tiny.Dockerfile .
+            -t $IMAGE:tiny-$VERSION \
+            -t $IMAGE:tiny-latest \
+            -f tiny.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 \
+            --build-arg HTTP_CLI_VERSION=$VERSION \
+            --output type=registry --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:micro -f micro.Dockerfile .
+            -t $IMAGE:micro-$VERSION \
+            -t $IMAGE:micro-latest \
+            -f micro.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 \
+            --build-arg HTTP_CLI_VERSION=$VERSION \
+            --output type=registry --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:full -f Dockerfile .
+            -t $IMAGE:full-$VERSION \
+            -t $IMAGE:full-latest \
+            -f Dockerfile .
         shell: bash
       - name: Log in to GHCR
         run: echo "${{ secrets.GHCR_PAT }}" | docker login ghcr.io -u skunxicat --password-stdin

Dockerfile

@@ -1,7 +1,108 @@
-FROM lamda-shell-runtime:tiny
+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}
+
+LABEL org.opencontainers.image.http_cli_version="${HTTP_CLI_VERSION}"
+
+# base: minimal runtime setup with jq
+FROM public.ecr.aws/lambda/provided:al2023 AS base
+
+ARG VERSION=develop
+ARG HTTP_CLI_VERSION
+
+# 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 org.opencontainers.image.source="https://github.com/ql4b/lambda-shell-runtime"
+LABEL org.opencontainers.image.version="${VERSION}"
+
+# tiny: add lamnda helper functions
+FROM base AS tiny
+
+ARG VERSION
+ARG HTTP_CLI_VERSION
+
+COPY task/helpers.sh helpers.sh
+
+LABEL org.opencontainers.image.title="lambda-shell-runtime:tiny"
+LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.http_cli_version="${HTTP_CLI_VERSION}"
+
+FROM public.ecr.aws/lambda/provided:al2023 AS awscurl-installer
+
+RUN dnf install -y unzip python3-pip  findutils && \
+    dnf clean all
+
+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 {} +
+
+# micro: inclues awscurl
+FROM tiny AS micro
+
+ARG VERSION
+ARG HTTP_CLI_VERSION
+
+RUN dnf install -y python3 && \
+    dnf clean all && \
+    rm -rf /var/cache/dnf
+
+COPY --from=awscurl-installer /tmp/awscurl /var/task/aws
+# Clean up Python cache and metadata
+RUN rm -rf \
+  /var/task/aws/__pycache__ \
+  /var/task/aws/*.dist-info \
+  /var/task/aws/**/__pycache__
+
+ENV PYTHONPATH="/var/task/aws"
+
+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
+
+LABEL org.opencontainers.image.title="lambda-shell-runtime:micro"
+LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.http_cli_version="${HTTP_CLI_VERSION}"
+
+# full: includes aws-cli for complete AWS functionality
+FROM tiny AS full
+
+ARG VERSION
+ARG HTTP_CLI_VERSION
 
 RUN dnf install -y \
-    jq \
     aws-cli  && \
     dnf clean all && \
-    rm -rf /var/cache/dnf
+    rm -rf /var/cache/dnf   
+
+LABEL org.opencontainers.image.title="lambda-shell-runtime:full"
+LABEL org.opencontainers.image.version="${VERSION}"
+LABEL org.opencontainers.image.http_cli_version="${HTTP_CLI_VERSION}"

build

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 
 set -ex
@@ -7,6 +6,7 @@ set -ex
 PLATFORM="linux/arm64"
 MODE="--load"
 TAG="lambda-shell-runtime"
+VERSION="${VERSION:-dev}"
 VARIANTS="base tiny micro full"
 
 # Parse arguments
@@ -40,17 +40,24 @@ while [ $# -gt 0 ]; do
 done
 
 for VARIANT in $VARIANTS; do
-  DOCKERFILE="./${VARIANT}.Dockerfile"
-  [ "$VARIANT" = "full" ] && DOCKERFILE="./Dockerfile"
+  DOCKERFILE="./Dockerfile"
+  TARGET="$VARIANT"
 
-  [ "$VARIANT" = "base" ] && MODE="--load"
+  [ "$VARIANT" = "base" ] && TARGET=""
 
   echo "Building $VARIANT ($DOCKERFILE) with platform $PLATFORM..."
   docker buildx build \
     --platform "$PLATFORM" \
     --secret id=github_token,env=GITHUB_TOKEN \
     --tag $TAG:$VARIANT \
     --file "$DOCKERFILE" \
+    ${TARGET:+--target "$TARGET"} \
     $MODE \
     .
-done
+
+  if [ -n "$VERSION" ]; then
+    echo "Tagging $TAG:$VARIANT-$VERSION"
+    docker tag $TAG:$VARIANT $TAG:$VARIANT-$VERSION
+  fi
+done
+