update to latest versions of dependencies and to nodejs14.x

Author: zoellner

README.md

@@ -6,7 +6,7 @@ AWS Lambda Layer providing [sharp](https://github.com/lovell/sharp) with HEIC (a
 ## Prerequisites
 
  * Docker
- * [SAM v1.22.0 or higher](https://github.com/awsdocs/aws-sam-developer-guide/blob/master/doc_source/serverless-sam-cli-install.md)
+ * [SAM v1.33.0 or higher](https://github.com/awsdocs/aws-sam-developer-guide/blob/master/doc_source/serverless-sam-cli-install.md)
 
 ## Usage
 
@@ -52,13 +52,7 @@ The special value `account` for `PRINCIPAL` is used to give access to the accoun
 The environment variables are used to create a `samconfig.toml` file that configures the `sam package` and `sam deploy` commands.
 
 ### Note regarding build process
-This requires `sam-cli` version `v1.22.0` or higher in order to use the `--build-image` option.
-
-The default build image for sam-cli is `public.ecr.aws/sam/build-nodejs12.x` which is an image that is stripped down too much to make it useful to build anything (missing many dependencies to compile things, missing yum). The workaround for this is to use the `lambci/lambda:build-nodejs12.x` image.
-
-As Docker Hub introduced rate limits for public pulls, the `lambci/lambda:build-nodejs12.x` often can't be used from within AWS CodeBuild. The image has therefore been repulished in the public AWS ECR registry as `public.ecr.aws/n8r6f1x4/lambci-temporary:build-nodejs12.x`.
-
-In order to pull the image from AWS ECR you might have to login to ECR using the command: `aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/n8r6f1x4`
+Previously, some custom docker images were needed to build this layer. AWS has since published newer images which work out of the box. `saml-cli` version `v1.33.0` is using `public.ecr.aws/sam/build-nodejs14.x:latest-x86_64`
 
 ## Background
 This repo exists as it is rather painful to compile all libraries required to get sharp to work with HEIC/HEIF files in an AWS Lambda environment. The sharp repository has several [issues](https://github.com/lovell/sharp/issues) related to this.
@@ -73,9 +67,11 @@ The following table lists the release version of this repo together with the ver
 |---------|--------|---------|---------|---------|----------|--------|
 |   1.1.0 | 0.27.0 |  8.10.5 |  1.10.0 |   1.1.0 |    1.0.8 |     12 |
 |   1.2.0 | 0.28.2 |  8.10.6 |  1.12.0 |   1.2.0 |    1.0.8 |     12 |
+|   2.0.0 | 0.29.1 |  8.11.3 |  1.12.0 |   1.2.1 |    1.0.8 |     14 |
 
 ### CompatibleRuntimes
-- `nodejs12.x`
+- `nodejs12.x` (v1.x)
+- `nodejs14.x` (v2.x)
 
 
 ## Contributions

buildspec.yaml

@@ -9,7 +9,7 @@ env:
 phases:
   install:
     runtime-versions:
-      nodejs: 12
+      nodejs: 14
   pre_build:
     commands:
       - NODE_ENV=development npm ci

examples/src/package.json

@@ -9,6 +9,6 @@
   "author": "Andreas Zoellner",
   "license": "MIT",
   "engines": {
-    "node": ">=12.0"
+    "node": ">=14.0"
   }
 }

examples/template.yaml

@@ -8,7 +8,7 @@ Resources:
     Properties:
       CodeUri: ./src/
       Handler: index.handler
-      Runtime: nodejs12.x
+      Runtime: nodejs14.x
       Timeout: 10
       MemorySize: 1024
       Layers:

layer/Makefile

@@ -1,9 +1,9 @@
 # Library Versions
-WEBP_VERSION=1.2.0
+WEBP_VERSION=1.2.1
 LIBDE265_VERSION=1.0.8
 LIBHEIF_VERSION=1.12.0
-VIPS_VERSION=8.10.6
-SHARP_VERSION=0.28.2
+VIPS_VERSION=8.11.3
+SHARP_VERSION=0.29.1
 
 PREFIX_PATH=/opt
 
@@ -16,7 +16,7 @@ build-SharpHEICLayer: libvips
 	# sharp uses several of the libs we installed or compiled. extract the full list and copy all of those into /opt/lib
 	# extract list with ldd from sharp.node, manipulate a bit with sed to only get the absolute paths, then copy
 	LD_LIBRARY_PATH=$(PREFIX_PATH)/lib npm --prefix "$(ARTIFACTS_DIR)/nodejs/" install sharp@$(SHARP_VERSION)
-	ldd $(ARTIFACTS_DIR)/nodejs/node_modules/sharp/build/Release/sharp.node | sed -nE "s/^[^\/\n]*(\/[^ ]+)(.*)/\1/p" | xargs cp -t $(ARTIFACTS_DIR)/lib
+	ldd $(ARTIFACTS_DIR)/nodejs/node_modules/sharp/build/Release/sharp-linux-x64.node | sed -nE "s/^[^\/\n]*(\/[^ ]+)(.*)/\1/p" | xargs cp -t $(ARTIFACTS_DIR)/lib
 
 libwebp:
 	curl -L https://github.com/webmproject/libwebp/archive/v$(WEBP_VERSION).tar.gz | tar zx

layer/src/package.json

@@ -8,9 +8,9 @@
   "license": "MIT",
   "devDependencies": {},
   "engines": {
-    "node": ">=12.0"
+    "node": ">=14.0"
   },
   "dependencies": {
-    "sharp": "^0.28.2"
+    "sharp": "^0.29.1"
   }
 }

package-lock.json

@@ -7,7 +7,7 @@
     "test": "npm run lint",
     "lint": "npx eslint .",
     "lint:fix": "npx eslint --fix .",
-    "build": "sam build --use-container --build-image public.ecr.aws/n8r6f1x4/lambci-temporary:build-nodejs12.x",
+    "build": "sam build --use-container",
     "prepackage": "node deployment/createSAMConfiguration.js > samconfig.toml",
     "package": "sam package",
     "predeploy": "npm run package",
@@ -25,9 +25,9 @@
   },
   "homepage": "https://github.com/zoellner/sharp-heic-lambda-layer#readme",
   "engines": {
-    "node": ">=12.0"
+    "node": ">=14.0"
   },
   "devDependencies": {
-    "eslint": "^7.17.0"
+    "eslint": "^7.32.0"
   }
 }

package.json

@@ -24,7 +24,7 @@ Resources:
       Description: Sharp Layer with HEIC Support
       ContentUri: ./layer/
       CompatibleRuntimes:
-        - nodejs12.x
+        - nodejs14.x
       LicenseInfo: 'MIT'
       RetentionPolicy: Retain
     Metadata: