fix: docker build sripts and image

Author: jacobtread

layers/make-poppler-layer-amd64.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
 # Build the container
-docker buildx build --platform linux/amd64 -f poppler.Dockerfile -t poppler-lambda-layer-amd64 .
+docker buildx build --platform linux/amd64 -f ./layers/poppler.Dockerfile -t poppler-lambda-layer-amd64 ./layers
 
 # Run a container and copy out the zip then delete it
 CONTAINER_ID=$(docker create --platform linux/amd64 poppler-lambda-layer-amd64)

layers/make-poppler-layer-arm64.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
 # Build the container
-docker buildx build --platform linux/arm64 -f poppler.Dockerfile -t poppler-lambda-layer-arm64.
+docker buildx build --platform linux/arm64 -f ./layers/poppler.Dockerfile -t poppler-lambda-layer-arm64 ./layers
 
 # Run a container and copy out the zip then delete it
 CONTAINER_ID=$(docker create --platform linux/arm64 poppler-lambda-layer-arm64)

layers/poppler.Dockerfile

@@ -3,14 +3,14 @@ FROM public.ecr.aws/lambda/provided:al2023 AS builder
 
 # Install required dependencies
 RUN dnf -y update && \
-    dnf -y install poppler poppler-utils poppler-data && \
+    dnf -y install poppler poppler-utils poppler-data zip && \
     dnf clean all
 
 # Copy bundling helper script
 COPY ./copy-dep.sh /tmp/copy-dep.sh
 
 # Create output bundle directory
-RUN mkdir -p /bundle/opt/bin /bundle/opt/lib /bundle/opt/fonts /bundle/opt/fontconfig /bundle/opt/poppler-data
+RUN mkdir -p /bundle/opt/bin /bundle/opt/lib /bundle/opt/etc /bundle/opt/etc/fonts /bundle/opt/share /bundle/opt/share/poppler-data
 
 # Copy required cli tools and their dependencies
 RUN chmod +x /tmp/copy-dep.sh && \
@@ -30,4 +30,4 @@ RUN cp -r /usr/share/fonts/* /bundle/opt/fonts/ && \
 RUN chmod -R 755 /bundle/opt
 
 # Zip up the bundle as the layer
-RUN zip /bundle /poppler-lambda-layer.zip
+RUN zip -r /poppler-lambda-layer.zip /bundle