From a1268d21a629abb1ed7c153b70778d868ac128f0 Mon Sep 17 00:00:00 2001
From: Ken Collins <ken@metaskills.net>
Date: Mon, 10 Oct 2022 12:17:57 -0400
Subject: [PATCH 1/2] Build package/opt Directory. DRY Usage.

---
 bin/build-arch            | 7 +++++++
 package/Dockerfile-amzn   | 6 +-----
 package/Dockerfile-debian | 6 +-----
 package/deploy            | 6 ------
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/bin/build-arch b/bin/build-arch
index b6dba1b..0b8e642 100755
--- a/bin/build-arch
+++ b/bin/build-arch
@@ -22,3 +22,10 @@ chmod +x "$BIN"
 zip -r "${BIN}.zip" "$BIN"
 zip -r "libcrypteia-${BUILD_ARCH}.zip" "$LIB"
 cd ..
+
+rm -rf ./package/opt
+mkdir -p ./package/opt/extensions
+mkdir -p ./package/opt/lib
+cp ./build/crypteia-amzn ./package/opt/extensions/crypteia
+cp ./build/libcrypteia-amzn.so ./package/opt/lib/libcrypteia.so
+
diff --git a/package/Dockerfile-amzn b/package/Dockerfile-amzn
index b50024d..0744ad6 100644
--- a/package/Dockerfile-amzn
+++ b/package/Dockerfile-amzn
@@ -1,8 +1,4 @@
 FROM alpine
 LABEL org.opencontainers.image.source "https://github.com/customink/crypteia"
 LABEL org.opencontainers.image.description "Rust Lambda Extension for any Runtime to preload SSM Parameters as Secure Environment Variables!"
-
-RUN mkdir -p /opt/lib
-RUN mkdir -p /opt/extensions
-COPY ./build/crypteia-amzn /opt/extensions/crypteia
-COPY ./build/libcrypteia-amzn.so /opt/lib/libcrypteia.so
+COPY ./package/opt /opt
diff --git a/package/Dockerfile-debian b/package/Dockerfile-debian
index c83676f..0744ad6 100644
--- a/package/Dockerfile-debian
+++ b/package/Dockerfile-debian
@@ -1,8 +1,4 @@
 FROM alpine
 LABEL org.opencontainers.image.source "https://github.com/customink/crypteia"
 LABEL org.opencontainers.image.description "Rust Lambda Extension for any Runtime to preload SSM Parameters as Secure Environment Variables!"
-
-RUN mkdir -p /opt/lib
-RUN mkdir -p /opt/extensions
-COPY ./build/crypteia-debian /opt/extensions/crypteia
-COPY ./build/libcrypteia-debian.so /opt/lib/libcrypteia.so
+COPY ./package/opt /opt
diff --git a/package/deploy b/package/deploy
index 8d8f2e2..e7ca927 100755
--- a/package/deploy
+++ b/package/deploy
@@ -6,12 +6,6 @@ if [ -z "${S3_BUCKET_NAME}" ]; then
   exit 1
 fi
 
-mkdir -p ./package/opt/extensions
-mkdir -p ./package/opt/lib
-
-cp ./build/crypteia-amzn ./package/opt/extensions/crypteia
-cp ./build/libcrypteia-amzn.so ./package/opt/lib/libcrypteia.so
-
 cd ./package/opt
 zip -r package.zip .
 mv package.zip ..

From 05032313ea2f94b26314eb772b4a81cb0f0149b2 Mon Sep 17 00:00:00 2001
From: Ken Collins <ken@metaskills.net>
Date: Mon, 10 Oct 2022 16:25:38 +0000
Subject: [PATCH 2/2] Fix BUILD_ARCH usage.

---
 bin/build-arch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/build-arch b/bin/build-arch
index 0b8e642..4e971a6 100755
--- a/bin/build-arch
+++ b/bin/build-arch
@@ -26,6 +26,5 @@ cd ..
 rm -rf ./package/opt
 mkdir -p ./package/opt/extensions
 mkdir -p ./package/opt/lib
-cp ./build/crypteia-amzn ./package/opt/extensions/crypteia
-cp ./build/libcrypteia-amzn.so ./package/opt/lib/libcrypteia.so
-
+cp "./build/crypteia-${BUILD_ARCH}" ./package/opt/extensions/crypteia
+cp "./build/libcrypteia-${BUILD_ARCH}.so" ./package/opt/lib/libcrypteia.so