From aac4ac332705f2f351af73048d0a22b5045c0409 Mon Sep 17 00:00:00 2001 From: Michael Peteuil Date: Tue, 25 Oct 2022 09:07:49 -0400 Subject: [PATCH 1/4] Use the scratch base for Lambda extensions --- package/Dockerfile-amzn | 2 +- package/Dockerfile-debian | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/Dockerfile-amzn b/package/Dockerfile-amzn index 0744ad6..6cadcb7 100644 --- a/package/Dockerfile-amzn +++ b/package/Dockerfile-amzn @@ -1,4 +1,4 @@ -FROM alpine +FROM scratch 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!" COPY ./package/opt /opt diff --git a/package/Dockerfile-debian b/package/Dockerfile-debian index 0744ad6..6cadcb7 100644 --- a/package/Dockerfile-debian +++ b/package/Dockerfile-debian @@ -1,4 +1,4 @@ -FROM alpine +FROM scratch 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!" COPY ./package/opt /opt From c1d0895da9e19405a939ca387ada4462dc79a87a Mon Sep 17 00:00:00 2001 From: Ken Collins Date: Fri, 9 Sep 2022 16:44:35 +0000 Subject: [PATCH 2/4] [DevContainer] Add ltrace and reformat && too. --- .devcontainer/Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d9db334..6914083 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,16 +1,16 @@ FROM mcr.microsoft.com/vscode/devcontainers/rust -RUN sudo apt-get update -y && \ - sudo apt-get upgrade -y && \ - sudo apt-get install zip musl-tools -y +RUN sudo apt-get update -y \ + && sudo apt-get upgrade -y \ + && sudo apt-get install zip musl-tools ltrace -y -RUN rustup update && \ - rustup target add x86_64-unknown-linux-musl +RUN rustup update \ + && rustup target add x86_64-unknown-linux-musl RUN sudo apt-get install -y nodejs -RUN cd /tmp && \ - curl -L https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip > aws-sam-cli-linux-x86_64.zip && \ - unzip aws-sam-cli-linux-x86_64.zip -d sam-installation && \ - rm -rf aws-sam-cli-linux-x86_64.zip && \ - sudo ./sam-installation/install +RUN cd /tmp \ + && curl -L https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip > aws-sam-cli-linux-x86_64.zip \ + && unzip aws-sam-cli-linux-x86_64.zip -d sam-installation \ + && rm -rf aws-sam-cli-linux-x86_64.zip \ + && sudo ./sam-installation/install From 65da180c0263527e278005c4b629a1973ba43766 Mon Sep 17 00:00:00 2001 From: Michael Peteuil Date: Tue, 25 Oct 2022 09:11:33 -0400 Subject: [PATCH 3/4] Trim whitespace --- test/libcrypteia.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libcrypteia.sh b/test/libcrypteia.sh index e4cd825..def8b1d 100755 --- a/test/libcrypteia.sh +++ b/test/libcrypteia.sh @@ -14,7 +14,7 @@ echo "=============================" echo "== Simulating crypteia binary JSON write ==" echo '{ "SECRET": "1A2B3C4D5E6F", - "ACCESS_KEY": "G7H8I9J0K1L2", + "ACCESS_KEY": "G7H8I9J0K1L2", "DB_URL": "mysql2://u:p@host:3306", "NR_KEY": "z6y5x4w3v2u1" }' > $CRYPTEIA_ENV_FILE @@ -38,7 +38,7 @@ assert "./test/libcrypteia/_envfile.sh" \ assert "./test/libcrypteia/empty-${TEST_LANG}.sh" \ "undefined" - + assert "./test/libcrypteia/fullpath-${TEST_LANG}.sh" \ "x-crypteia-ssm-path:/crypteia/v5/myapp/envs" \ "Because not replaced by a single env var." From ec5fe3497e2fb2bc49b9b4a71a09c0d992e1bbf5 Mon Sep 17 00:00:00 2001 From: Michael Peteuil Date: Tue, 25 Oct 2022 10:41:48 -0400 Subject: [PATCH 4/4] Changelog entry for scratch & ltrace --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b1b4e3..d0eb055 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Added + + - `ltrace` for debugging + +### Changed + + - Use `scratch` base instead of `alpine` for smaller lambda extension images. + ## [0.94.0] - 2022-10-03 Schedule release. No changes.