Add nodejs12.x runtime

Author: mhart

README.md

@@ -60,11 +60,11 @@ You can also use [yumda](https://github.com/lambci/yumda) to install precompiled
 ## Run Examples
 
 ```sh
-# Test an index.handler function from the current directory on Node.js v10.x
-docker run --rm -v "$PWD":/var/task lambci/lambda:nodejs10.x index.handler
+# Test an index.handler function from the current directory on Node.js v12.x
+docker run --rm -v "$PWD":/var/task lambci/lambda:nodejs12.x index.handler
 
 # If using a function other than index.handler, with a custom event
-docker run --rm -v "$PWD":/var/task lambci/lambda:nodejs10.x index.myHandler '{"some": "event"}'
+docker run --rm -v "$PWD":/var/task lambci/lambda:nodejs12.x index.myHandler '{"some": "event"}'
 
 # Use the Node.js v8.10 runtime in a similar fashion
 docker run --rm -v "$PWD":/var/task lambci/lambda:nodejs8.10 index.myHandler '{}'
@@ -123,7 +123,7 @@ To use the build images, for compilation, deployment, etc:
 
 ```sh
 # To compile native deps in node_modules
-docker run --rm -v "$PWD":/var/task lambci/lambda:build-nodejs10.x npm rebuild
+docker run --rm -v "$PWD":/var/task lambci/lambda:build-nodejs12.x npm rebuild
 
 # To resolve dependencies on go1.x (working directory is /go/src/handler)
 docker run --rm -v "$PWD":/go/src/handler lambci/lambda:build-go1.x go mod download
@@ -200,6 +200,7 @@ These follow the Lambda runtime names:
   - `nodejs6.10`
   - `nodejs8.10`
   - `nodejs10.x`
+  - `nodejs12.x`
   - `python2.7`
   - `python3.6`
   - `python3.7`
@@ -213,6 +214,7 @@ These follow the Lambda runtime names:
   - `build-nodejs6.10`
   - `build-nodejs8.10`
   - `build-nodejs10.x`
+  - `build-nodejs12.x`
   - `build-python2.7`
   - `build-python3.6`
   - `build-python3.7`

base/build-all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
+RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x nodejs12.x python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
 
 TOP_DIR="${PWD}/.."
 

base/diff-2.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUNTIMES="nodejs10.x"
+RUNTIMES="nodejs10.x nodejs12.x"
 
 rm -rf diff-2
 mkdir -p diff-2
@@ -39,3 +39,9 @@ echo
 diff docker/var/runtime lambda/var/runtime
 echo
 diff -qr docker lambda
+
+cd ${DIFF_DIR}/nodejs12.x
+pwd
+diff docker/var/runtime lambda/var/runtime
+diff -qr docker lambda
+echo

base/dump-node12x.js

@@ -0,0 +1,38 @@
+const fs = require('fs')
+const { execSync } = require('child_process')
+const AWS = require('aws-sdk')
+const s3 = new AWS.S3()
+
+// Depends on tar-find-layer for the tar/find/xargs binaries
+exports.handler = async(event, context) => {
+  const execOpts = { stdio: 'inherit', maxBuffer: 16 * 1024 * 1024 }
+
+  let filename = 'nodejs12.x.tgz'
+  let cmd = 'tar -cpzf /tmp/' + filename +
+    ' --numeric-owner --ignore-failed-read /var/runtime /var/lang /var/rapid'
+
+  execSync(cmd, execOpts)
+
+  console.log('Zipping done! Uploading...')
+
+  let data = await s3.upload({
+    Bucket: 'lambci',
+    Key: 'fs/' + filename,
+    Body: fs.createReadStream('/tmp/' + filename),
+    ACL: 'public-read',
+  }).promise()
+
+  console.log('Uploading done!')
+
+  console.log(process.execPath)
+  console.log(process.execArgv)
+  console.log(process.argv)
+  console.log(process.cwd())
+  console.log(__filename)
+  console.log(process.env)
+  execSync('echo /proc/1/environ; xargs -n 1 -0 < /proc/1/environ', execOpts)
+  execSync("bash -O extglob -c 'for cmd in /proc/+([0-9])/cmdline; do echo $cmd; xargs -n 1 -0 < $cmd; done'", execOpts)
+  console.log(context)
+
+  return data
+}

base/publish-all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
+RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x nodejs12.x python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
 
 echo -n "Enter repository passphrase: "
 read -s DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE

base/tag-all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
+RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 nodejs10.x nodejs12.x python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1"
 
 git tag -f latest
 

base/test-all.sh

@@ -10,6 +10,7 @@ docker run --rm -v "$PWD":/var/task lambci/lambda:nodejs8.10
 cd ${EXAMPLES_DIR}/nodejs8.10
 docker run --rm -v "$PWD":/var/task lambci/lambda:nodejs8.10
 docker run --rm -v "$PWD":/var/task lambci/lambda:nodejs10.x index.handler
+docker run --rm -v "$PWD":/var/task lambci/lambda:nodejs12.x index.handler
 
 cd ${EXAMPLES_DIR}/nodejs-native-module
 npm run build

nodejs12.x/build/Dockerfile

@@ -0,0 +1,12 @@
+FROM lambci/lambda-base-2:build
+
+ENV PATH=/var/lang/bin:$PATH \
+    LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \
+    AWS_EXECUTION_ENV=AWS_Lambda_nodejs12.x \
+    NODE_PATH=/opt/nodejs/node12/node_modules:/opt/nodejs/node_modules:/var/runtime/node_modules
+
+RUN rm -rf /var/runtime /var/lang /var/rapid && \
+  curl https://lambci.s3.amazonaws.com/fs/nodejs12.x.tgz | tar -zx -C /
+
+# Add these as a separate layer as they get updated frequently
+RUN pip install -U awscli boto3 aws-sam-cli==0.31.0 aws-lambda-builders==0.5.0 --no-cache-dir

nodejs12.x/run/Dockerfile

@@ -0,0 +1,21 @@
+FROM lambci/lambda-base
+
+RUN curl https://lambci.s3.amazonaws.com/fs/nodejs12.x.tgz | tar -zx -C /opt
+
+
+FROM lambci/lambda:provided
+
+
+FROM lambci/lambda-base-2
+
+ENV PATH=/var/lang/bin:$PATH \
+    LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \
+    AWS_EXECUTION_ENV=AWS_Lambda_nodejs12.x
+
+COPY --from=0 /opt/* /var/
+
+COPY --from=1 /var/runtime/init /var/rapid/init
+
+USER sbx_user1051
+
+ENTRYPOINT ["/var/rapid/init", "--bootstrap", "/var/runtime/bootstrap"]