Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulMaddox authored Apr 5, 2018
2 parents 0aeacd7 + 2844be1 commit c9bdb4b
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*Issue #, if available:*

*Description of changes:*


By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
4 changes: 4 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## Code of Conduct
This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
opensource-codeofconduct@amazon.com with any additional questions or comments.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -492,10 +492,12 @@ sam local invoke --docker-volume-basedir /c/Users/shlee322/projects/test "Rating
- [x] `nodejs`
- [x] `nodejs4.3`
- [x] `nodejs6.10`
- [x] `nodejs8.10`
- [x] `java8`
- [x] `python2.7`
- [x] `python3.6`
- [ ] `dotnetcore1.0`
- [x] `dotnetcore2.0`
* [x] AWS credential support
* [x] Debugging support
* [x] Inline Swagger support within SAM templates
Expand Down
30 changes: 24 additions & 6 deletions runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ var runtimeName = struct {
nodejs string
nodejs43 string
nodejs610 string
nodejs810 string
python27 string
python36 string
java8 string
Expand All @@ -90,6 +91,7 @@ var runtimeName = struct {
nodejs: "nodejs",
nodejs43: "nodejs4.3",
nodejs610: "nodejs6.10",
nodejs810: "nodejs8.10",
python27: "python2.7",
python36: "python3.6",
java8: "java8",
Expand All @@ -101,6 +103,7 @@ var runtimeImageFor = map[string]string{
runtimeName.nodejs: "lambci/lambda:nodejs",
runtimeName.nodejs43: "lambci/lambda:nodejs4.3",
runtimeName.nodejs610: "lambci/lambda:nodejs6.10",
runtimeName.nodejs810: "lambci/lambda:nodejs8.10",
runtimeName.python27: "lambci/lambda:python2.7",
runtimeName.python36: "lambci/lambda:python3.6",
runtimeName.java8: "lambci/lambda:java8",
Expand Down Expand Up @@ -455,6 +458,7 @@ func (r *Runtime) getDebugEntrypoint() (overrides []string) {
"-XX:+UseSerialGC",
//"-Xshare:on", doesn't work in conjunction with the debug options
"-XX:-TieredCompilation",
"-Djava.net.preferIPv4Stack=true",
"-jar",
"/var/runtime/lib/LambdaJavaRTEntry-1.0.jar",
)
Expand All @@ -480,9 +484,9 @@ func (r *Runtime) getDebugEntrypoint() (overrides []string) {
overrides = append(overrides,
"--debug-brk="+r.DebugPort,
"--nolazy",
"--max-old-space-size=1229",
"--max-semi-space-size=76",
"--max-executable-size=153",
"--max-old-space-size=2547",
"--max-semi-space-size=150",
"--max-executable-size=160",
"--expose-gc",
"/var/runtime/node_modules/awslambda/index.js",
)
Expand All @@ -495,10 +499,24 @@ func (r *Runtime) getDebugEntrypoint() (overrides []string) {
"--inspect="+r.DebugPort,
"--debug-brk",
"--nolazy",
"--max-old-space-size=1229",
"--max-semi-space-size=76",
"--max-executable-size=153",
"--max-old-space-size=2547",
"--max-semi-space-size=150",
"--max-executable-size=160",
"--expose-gc",
"/var/runtime/node_modules/awslambda/index.js",
)
case runtimeName.nodejs810:
overrides = []string{
"/var/lang/bin/node",
}
overrides = append(overrides, debuggerArgsArray...)
overrides = append(overrides,
"--inspect="+r.DebugPort,
"--debug-brk",
"--nolazy",
"--expose-gc",
"--max-semi-space-size=150",
"--max-old-space-size=2707",
"/var/runtime/node_modules/awslambda/index.js",
)
case runtimeName.python27:
Expand Down

0 comments on commit c9bdb4b

Please sign in to comment.