Skip to content

Commit 742abf3

Browse files
committed
Refactor Layer->Package Dir. v0.94.0
1 parent f566020 commit 742abf3

File tree

11 files changed

+21
-22
lines changed

11 files changed

+21
-22
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ jobs:
4646
prerelease: ${{ steps.changelog_reader.outputs.status == 'prereleased' }}
4747
draft: ${{ steps.changelog_reader.outputs.status == 'unreleased' }}
4848
token: ${{ secrets.GITHUB_TOKEN }}
49-
- name: Push Lambda Extension Layer Image
50-
env:
51-
CRYPTEIA_VERSION: ${{ steps.changelog_reader.outputs.version }}
49+
- name: Push Container Package(s)
5250
run: |
53-
./layer/deploy-images
51+
CRYPTEIA_VERSION=${{ steps.changelog_reader.outputs.version }} ./package/deploy-images
52+
CRYPTEIA_VERSION=latest ./package/deploy-images

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/build
22
/target
3-
/layer/opt
4-
/layer/layer.zip
5-
/layer/packaged.yaml
3+
/package/opt
4+
/package/package.zip
5+
/package/packaged.yaml
66
outputs.json

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [0.93.0] - 2022-10-03
8+
## [0.94.0] - 2022-10-03
99

1010
Schedule release. No changes.
1111

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "crypteia"
3-
version = "0.93.0"
3+
version = "0.94.0"
44
edition = "2021"
55

66
[[bin]]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ When building your own Lambda Containers, use both the `crypteia` binary and `li
4545
You have two options here. The easiest is to use Docker's multi stage builds with our [Extension Containers]([https://github.com/orgs/customink/packages?ecosystem=container&tab=packages&ecosystem=container&q=extension](https://github.com/orgs/customink/packages?repo_name=crypteia&q=extension)) to copy the `/opt` directory matching your platform and Crypteia version number. example below. Remember to use `-debian` vs `-amzn` if you are using your own Linux containers. Or change the version number depending on your needs.
4646

4747
```dockerfile
48-
FROM ghcr.io/customink/crypteia-extension-amzn:0.93.0 AS crypteia
48+
FROM ghcr.io/customink/crypteia-extension-amzn:latest AS crypteia
4949
FROM public.ecr.aws/lambda/nodejs:16
5050
COPY --from=crypteia /opt /opt
5151
ENV LD_PRELOAD=/opt/lib/libcrypteia.so
@@ -70,7 +70,7 @@ Our Amazon Linux 2 files can be used within a [Lambda Extension](https://docs.aw
7070
```shell
7171
aws configure
7272
./amzn/setup
73-
S3_BUCKET_NAME=my-bucket ./layer/deploy
73+
S3_BUCKET_NAME=my-bucket ./package/deploy
7474
```
7575

7676
## Usage
File renamed without changes.
File renamed without changes.

layer/deploy renamed to package/deploy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ if [ -z "${S3_BUCKET_NAME}" ]; then
66
exit 1
77
fi
88

9-
mkdir -p ./layer/opt/extensions
10-
mkdir -p ./layer/opt/lib
9+
mkdir -p ./package/opt/extensions
10+
mkdir -p ./package/opt/lib
1111

12-
cp ./build/crypteia-amzn ./layer/opt/extensions/crypteia
13-
cp ./build/libcrypteia-amzn.so ./layer/opt/lib/libcrypteia.so
12+
cp ./build/crypteia-amzn ./package/opt/extensions/crypteia
13+
cp ./build/libcrypteia-amzn.so ./package/opt/lib/libcrypteia.so
1414

15-
cd ./layer/opt
16-
zip -r layer.zip .
17-
mv layer.zip ..
15+
cd ./package/opt
16+
zip -r package.zip .
17+
mv package.zip ..
1818
cd ..
1919

2020
sam package \

layer/deploy-images renamed to package/deploy-images

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ echo "== [Lambda Extension Images] building... =="
1212

1313
docker build \
1414
--tag "ghcr.io/customink/crypteia-extension-amzn:${CRYPTEIA_VERSION}" \
15-
--file layer/Dockerfile-amzn .
15+
--file package/Dockerfile-amzn .
1616

1717
docker build \
1818
--tag "ghcr.io/customink/crypteia-extension-debian:${CRYPTEIA_VERSION}" \
19-
--file layer/Dockerfile-debian .
19+
--file package/Dockerfile-debian .
2020

2121
echo "== [Lambda Extension Images] pushes... =="
2222

0 commit comments

Comments
 (0)