FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Update to match latest runtimes · dev-mcm/docker-lambda@f65a259 · GitHub

/ docker-lambda Public
forked from lambci/docker-lambda

Commit f65a259

Browse files
mhart
committed
Update to match latest runtimes
1 parent 6b5cb5b commit f65a259

18 files changed

Lines changed: 78 additions & 146 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules
22
base/diff
3+
*.pyc

‎base/Dockerfile‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,23 @@
1-
FROM lambci/lambda-base
1+
FROM lambci/lambda-base:raw
22

3-
ENV PATH=/usr/local/lib64/node-v4.3.x/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
4-
LD_LIBRARY_PATH=/usr/local/lib64/node-v4.3.x/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
3+
ENV PATH=/usr/local/bin:/usr/bin/:/bin \
4+
LD_LIBRARY_PATH=/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
55
LANG=en_US.UTF-8 \
6+
TZ=:UTC \
67
LAMBDA_TASK_ROOT=/var/task \
78
LAMBDA_RUNTIME_DIR=/var/runtime \
89
_LAMBDA_CONTROL_SOCKET=14 \
910
_LAMBDA_SHARED_MEM_FD=11 \
1011
_LAMBDA_LOG_FD=9 \
12+
_LAMBDA_SB_ID=7 \
1113
_LAMBDA_CONSOLE_SOCKET=16 \
1214
_LAMBDA_RUNTIME_LOAD_TIME=1530232235231 \
1315
_AWS_XRAY_DAEMON_ADDRESS=169.254.79.2 \
1416
_AWS_XRAY_DAEMON_PORT=2000 \
1517
AWS_XRAY_DAEMON_ADDRESS=169.254.79.2:2000 \
1618
AWS_XRAY_CONTEXT_MISSING=LOG_ERROR \
17-
_X_AMZN_TRACE_ID=Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0
19+
_X_AMZN_TRACE_ID='Parent=11560be54abce8ed'
1820

19-
WORKDIR /var/task
20-
21-
# A couple of packages are either missing critical-ish files, or didn't make it into the tar
22-
# Reinstalling filesystem might not succeed fully, but continue anyway
23-
RUN mkdir /tmp && chmod 1777 /tmp && yum reinstall -y filesystem; \
24-
yum reinstall -y shadow-utils && \
25-
yum groupinstall -y development && \
26-
yum install -y clang cmake aws-cli docker \
27-
openssl-devel libffi-devel python27-devel python34-devel \
28-
libmpc-devel mpfr-devel gmp-devel && \
29-
rm -rf /var/cache/yum /var/lib/rpm/__db.* && \
30-
> /var/log/yum.log
21+
RUN mkdir /tmp && chown sbx_user1051:495 /tmp && chmod 700 /tmp
3122

23+
WORKDIR /var/task

‎base/build/Dockerfile‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM lambci/lambda-base
2+
3+
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
4+
5+
# A couple of packages are either missing critical-ish files, or didn't make it into the tar
6+
# Reinstalling filesystem might not succeed fully, but continue anyway
7+
RUN chmod 1777 /tmp && yum reinstall -y filesystem; \
8+
yum reinstall -y shadow-utils && \
9+
yum groupinstall -y development && \
10+
yum install -y clang cmake aws-cli docker \
11+
openssl-devel libffi-devel python27-devel python34-devel \
12+
libmpc-devel mpfr-devel gmp-devel && \
13+
rm -rf /var/cache/yum /var/lib/rpm/__db.* && \
14+
> /var/log/yum.log
15+

‎base/create-base.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22

3-
IMAGE_NAME=lambci/lambda-base
3+
curl https://lambci.s3.amazonaws.com/fs/nodejs4.3.tgz | gzip -d | docker import - lambci/lambda-base:raw
44

5-
curl https://lambci.s3.amazonaws.com/fs/nodejs4.3.tgz | gzip -d | docker import - $IMAGE_NAME
5+
docker build --squash -t lambci/lambda-base .

‎base/create-build.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

3-
IMAGE_NAME=lambci/lambda-base:build
4-
5-
docker build $BUILD_ARG -t ${IMAGE_NAME} .
3+
docker build -t lambci/lambda-base:build -f ./build/Dockerfile .

‎base/test.sh‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ CMD="BUILD_ONLY=true npm install --build-from-source \
55
bignum \
66
grpc \
77
hiredis \
8-
ibm_db \
98
iconv \
109
kerberos \
1110
leveldown \
1211
murmurhash-native \
13-
nodegit \
1412
node-cmake \
15-
realm \
1613
serialport \
1714
snappy \
1815
sqlite3 \
@@ -21,8 +18,13 @@ CMD="BUILD_ONLY=true npm install --build-from-source \
2118
websocket \
2219
webworker-threads \
2320
x509 \
24-
node-sass && \
25-
cd node_modules/node-sass && npm install && node scripts/build -f
21+
node-sass
2622
"
2723

28-
docker run -e npm_config_unsafe-perm=true lambci/lambda-base:build sh -c "$CMD" && echo "Success!"
24+
docker run \
25+
-e PATH=/usr/local/lib64/node-v4.3.x/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
26+
-e LD_LIBRARY_PATH=/usr/local/lib64/node-v4.3.x/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
27+
-e AWS_EXECUTION_ENV=AWS_Lambda_nodejs4.3 \
28+
-e NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules \
29+
-e npm_config_unsafe-perm=true \
30+
lambci/lambda-base:build sh -c "$CMD" && echo "Success!"

‎nodejs/build/Dockerfile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM lambci/lambda-base:build
22

3-
ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
4-
LD_LIBRARY_PATH=/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
5-
AWS_EXECUTION_ENV=AWS_Lambda_nodejs \
3+
ENV AWS_EXECUTION_ENV=AWS_Lambda_nodejs \
64
NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules \
75
npm_config_unsafe-perm=true
86

‎nodejs/run/Dockerfile‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,13 @@
11
FROM lambci/lambda-base
22

3-
ENV PATH=/usr/local/bin:/usr/bin/:/bin \
4-
LD_LIBRARY_PATH=/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
5-
LANG=en_US.UTF-8 \
6-
LAMBDA_TASK_ROOT=/var/task \
7-
LAMBDA_RUNTIME_DIR=/var/runtime \
8-
_LAMBDA_CONTROL_SOCKET=14 \
9-
_LAMBDA_SHARED_MEM_FD=11 \
10-
_LAMBDA_LOG_FD=9 \
11-
_LAMBDA_CONSOLE_SOCKET=16 \
12-
_LAMBDA_RUNTIME_LOAD_TIME=1530232235231 \
13-
_AWS_XRAY_DAEMON_ADDRESS=169.254.79.2 \
14-
_AWS_XRAY_DAEMON_PORT=2000 \
15-
AWS_XRAY_DAEMON_ADDRESS=169.254.79.2:2000 \
16-
AWS_XRAY_CONTEXT_MISSING=LOG_ERROR \
17-
_X_AMZN_TRACE_ID=Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0 \
18-
AWS_EXECUTION_ENV=AWS_Lambda_nodejs \
3+
ENV AWS_EXECUTION_ENV=AWS_Lambda_nodejs \
194
NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules
205

21-
RUN rm -rf /var/runtime /var/lang && mkdir /tmp && chown sbx_user1051:495 /tmp && chmod 700 /tmp && \
6+
RUN rm -rf /var/runtime /var/lang && \
227
curl https://lambci.s3.amazonaws.com/fs/nodejs.tgz | tar -zx -C /
238

249
ADD awslambda-mock.js /var/runtime/node_modules/awslambda/build/Release/awslambda.js
2510

26-
WORKDIR /var/task
27-
2811
USER sbx_user1051
2912

3013
ENTRYPOINT ["/usr/bin/node", "--max-old-space-size=1229", "--max-new-space-size=153", "--max-executable-size=153", "--expose-gc", \

‎nodejs/run/awslambda-mock.js‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
var crypto = require('crypto')
22

3-
var HANDLER = process.argv[2] || process.env.AWS_LAMBDA_FUNCTION_HANDLER || 'index.handler'
3+
var HANDLER = process.argv[2] || process.env.AWS_LAMBDA_FUNCTION_HANDLER || process.env._HANDLER || 'index.handler'
44
var EVENT_BODY = process.argv[3] || process.env.AWS_LAMBDA_EVENT_BODY || '{}'
55

66
var FN_NAME = process.env.AWS_LAMBDA_FUNCTION_NAME || 'test'
77
var VERSION = process.env.AWS_LAMBDA_FUNCTION_VERSION || '$LATEST'
8-
var MEM_SIZE = process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE || 1536
9-
var TIMEOUT = process.env.AWS_LAMBDA_FUNCTION_TIMEOUT || 300
8+
var MEM_SIZE = process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE || '1536'
9+
var TIMEOUT = process.env.AWS_LAMBDA_FUNCTION_TIMEOUT || '300'
1010
var REGION = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION || 'us-east-1'
1111
var ACCOUNT_ID = process.env.AWS_ACCOUNT_ID || randomAccountId()
1212
var ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID || 'SOME_ACCESS_KEY_ID'
@@ -25,8 +25,12 @@ function systemErr(str) {
2525
process.stderr.write(formatErr(str) + '\n')
2626
}
2727

28-
function handleResult(resultStr) {
29-
process.stdout.write(resultStr)
28+
function handleResult(resultStr, cb) {
29+
if (!process.stdout.write(resultStr)) {
30+
process.stdout.once('drain', cb)
31+
} else {
32+
process.nextTick(cb)
33+
}
3034
}
3135

3236
// Don't think this can be done in the Docker image
@@ -40,6 +44,7 @@ process.env.AWS_LAMBDA_LOG_STREAM_NAME = new Date().toISOString().slice(0, 10).r
4044
'/[' + VERSION + ']' + crypto.randomBytes(16).toString('hex')
4145
process.env.AWS_REGION = REGION
4246
process.env.AWS_DEFAULT_REGION = REGION
47+
process.env._HANDLER = HANDLER
4348

4449
var OPTIONS = {
4550
invokeid: uuid(),

‎nodejs4.3/run/Dockerfile‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,13 @@ FROM lambci/lambda-base
22

33
ENV PATH=/usr/local/lib64/node-v4.3.x/bin:/usr/local/bin:/usr/bin/:/bin \
44
LD_LIBRARY_PATH=/usr/local/lib64/node-v4.3.x/lib:/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib \
5-
LANG=en_US.UTF-8 \
6-
LAMBDA_TASK_ROOT=/var/task \
7-
LAMBDA_RUNTIME_DIR=/var/runtime \
8-
_LAMBDA_CONTROL_SOCKET=14 \
9-
_LAMBDA_SHARED_MEM_FD=11 \
10-
_LAMBDA_LOG_FD=9 \
11-
_LAMBDA_CONSOLE_SOCKET=16 \
12-
_LAMBDA_RUNTIME_LOAD_TIME=1530232235231 \
13-
_AWS_XRAY_DAEMON_ADDRESS=169.254.79.2 \
14-
_AWS_XRAY_DAEMON_PORT=2000 \
15-
AWS_XRAY_DAEMON_ADDRESS=169.254.79.2:2000 \
16-
AWS_XRAY_CONTEXT_MISSING=LOG_ERROR \
17-
_X_AMZN_TRACE_ID=Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=0 \
185
AWS_EXECUTION_ENV=AWS_Lambda_nodejs4.3 \
196
NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules
207

21-
RUN mkdir /tmp && chown sbx_user1051:495 /tmp && chmod 700 /tmp
22-
238
ADD awslambda-mock.js /var/runtime/node_modules/awslambda/build/Release/awslambda.js
249

25-
WORKDIR /var/task
26-
2710
USER sbx_user1051
2811

29-
ENTRYPOINT ["/usr/local/lib64/node-v4.3.x/bin/node", "--max-old-space-size=1229", "--max-semi-space-size=76", "--max-executable-size=153", "--expose-gc", \
12+
ENTRYPOINT ["/usr/local/lib64/node-v4.3.x/bin/node", "--max-old-space-size=1228", "--max-semi-space-size=77", "--max-executable-size=154", "--expose-gc", \
3013
"/var/runtime/node_modules/awslambda/index.js"]
3114

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL