fix: prevent extra dirs being included in lambda zip bundle

Author: jacobtread

.github/workflows/build-release.yml

@@ -63,7 +63,11 @@ jobs:
                   mkdir /tmp/processing-lambda
                   unzip docbox-upload-completion-lambda.zip -d /tmp/processing-lambda
                   unzip poppler-lambda-layer.zip -d /tmp/processing-lambda
-                  zip -r docbox-upload-completion-lambda-amd64.zip /tmp/processing-lambda
+                  (
+                    cd /tmp/processing-lambda
+                    zip -r /tmp/docbox-upload-completion-lambda-amd64.zip .
+                  )
+                  mv /tmp/docbox-upload-completion-lambda-amd64.zip .
               shell: bash
 
             # Upload the built artifacts
@@ -140,7 +144,11 @@ jobs:
                   mkdir /tmp/processing-lambda
                   unzip docbox-upload-completion-lambda.zip -d /tmp/processing-lambda
                   unzip poppler-lambda-layer.zip -d /tmp/processing-lambda
-                  zip -r docbox-upload-completion-lambda-arm64.zip /tmp/processing-lambda
+                  (
+                    cd /tmp/processing-lambda
+                    zip -r /tmp/docbox-upload-completion-lambda-arm64.zip .
+                  )
+                  mv /tmp/docbox-upload-completion-lambda-arm64.zip .
               shell: bash
 
             # Upload the built artifacts

layers/make-poppler-layer-amd64.sh

@@ -6,5 +6,5 @@ docker buildx build --build-arg BASE_IMAGE=public.ecr.aws/lambda/provided:al2023
 
 # Run a container and copy out the zip then delete it
 CONTAINER_ID=$(docker create --platform linux/amd64 poppler-lambda-layer-amd64)
-docker cp $CONTAINER_ID:/poppler-lambda-layer.zip ./poppler-lambda-layer.zip
+docker cp $CONTAINER_ID:/tmp/poppler-lambda-layer.zip ./poppler-lambda-layer.zip
 docker rm $CONTAINER_ID

layers/make-poppler-layer-arm64.sh

@@ -6,5 +6,5 @@ docker buildx build --build-arg BASE_IMAGE=public.ecr.aws/lambda/provided:al2023
 
 # Run a container and copy out the zip then delete it
 CONTAINER_ID=$(docker create --platform linux/arm64 poppler-lambda-layer-arm64)
-docker cp $CONTAINER_ID:/poppler-lambda-layer.zip ./poppler-lambda-layer.zip
+docker cp $CONTAINER_ID:/tmp/poppler-lambda-layer.zip ./poppler-lambda-layer.zip
 docker rm $CONTAINER_ID

layers/poppler.Dockerfile

@@ -31,4 +31,5 @@ RUN cp -r /usr/share/fonts/* /bundle/opt/fonts/ && \
 RUN chmod -R 755 /bundle/opt
 
 # Zip up the bundle as the layer
-RUN zip -r /poppler-lambda-layer.zip /bundle
+RUN cd /bundle/opt && \
+    zip -r /tmp/poppler-lambda-layer.zip .