Skip to content

Commit 3a00780

Browse files
committed
Update build layer script
1 parent 3214c78 commit 3a00780

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

build-layer.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ LAYER_DESCRIPTION="AWS Lambda Layer with node-canvas and its dependencies packag
1717
LAYER_VERSION=2.11.0
1818
LAYER_AUTHOR="Charoite Lee"
1919

20+
DOT_CHAR="."
21+
NODE_VERSION=$(node -v)
22+
NODE_VERSION=${NODE_VERSION:1}
23+
2024
# Remove packaged layer if exists
2125
if [ -n "$(find . -name 'canvas-nodejs_v*.zip')" ]; then
2226
rm canvas-nodejs_v*.zip
@@ -27,7 +31,7 @@ if [ "$(ls -A lib)" ]; then
2731
rm lib/*
2832
fi
2933
cd nodejs
30-
rm -rf node_modules package*.json ../package-lock.json
34+
rm -rf node_modules node${NODE_VERSION%%$DOT_CHAR*} package*.json ../package-lock.json
3135
npm init -y
3236
npm install canvas --build-from-source
3337
npm install fabric
@@ -41,6 +45,8 @@ npm test
4145
cp package-lock.json ..
4246

4347
# Prepare and package layer
48+
mkdir node${NODE_VERSION%%$DOT_CHAR*}
49+
mv node_modules node${NODE_VERSION%%$DOT_CHAR*}
4450
cd ..
4551
find nodejs/node* -type f -name '*.node' 2>/dev/null | grep -v 'obj\.target' | xargs ldd | awk 'NF == 4 { system("cp " $3 " lib") }'
46-
zip -q -r canvas-nodejs_v$LAYER_VERSION.zip . -x LICENSE README.md .git/**\* nodejs/test/**\* *.yml build-layer.sh
52+
zip -q -r canvas-nodejs_v$LAYER_VERSION.zip . -x LICENSE README.md .git/**\* .github/**\* .gitignore nodejs/test/**\* *.yml build-layer.sh

0 commit comments

Comments
 (0)