Skip to content
This repository was archived by the owner on Dec 11, 2023. It is now read-only.

Commit 3846202

Browse files
authored
Merge pull request #26 from tzununbekov/master
Go runtime fixes
2 parents 0108da9 + 46de67d commit 3846202

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

go-1.x/bootstrap.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,22 +42,19 @@ func main() {
4242
os.Setenv("PATH", os.Getenv("PATH")+":/opt")
4343

4444
cmd := exec.Command(handler)
45-
cmd.Stdout = os.Stderr
46-
cmd.Stderr = os.Stderr
4745
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
4846
cmd.Env = append(os.Environ(),
4947
"_LAMBDA_SERVER_PORT="+lambdaPort,
5048
)
5149

52-
if err := cmd.Start(); err != nil {
53-
sendResponse(apiURL+initErrPath, err.Error())
50+
output, err := cmd.CombinedOutput()
51+
if err != nil {
52+
sendResponse(apiURL+initErrPath, fmt.Sprintf("%s:%s\n", output, err))
5453
return
5554
}
56-
5755
defer syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
5856

5957
var conn net.Conn
60-
var err error
6158
for {
6259
if conn, err = net.Dial("tcp", ":"+lambdaPort); err == nil {
6360
break

go-1.x/buildtemplate.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
cd /workspace/${DIRECTORY}
3838
cat <<EOF > Dockerfile
3939
FROM golang:alpine
40-
RUN apk --no-cache add git \
40+
RUN apk --no-cache add git ca-certificates \
4141
&& go get github.com/triggermesh/aws-custom-runtime \
4242
&& go get github.com/triggermesh/knative-lambda-runtime/go-1.x \
4343
&& go get github.com/golang/dep/...
@@ -53,6 +53,7 @@ spec:
5353
ENV LAMBDA_TASK_ROOT "/opt"
5454
ENV _HANDLER "handler"
5555
56+
COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
5657
COPY --from=0 /go/bin/go-1.x /opt/bootstrap
5758
COPY --from=0 /go/bin/ /opt
5859

0 commit comments

Comments
 (0)