diff --git a/dockerfiles/run-pack/Dockerfile b/dockerfiles/run-pack/Dockerfile index a203257b..623864f4 100644 --- a/dockerfiles/run-pack/Dockerfile +++ b/dockerfiles/run-pack/Dockerfile @@ -1,16 +1,10 @@ -FROM alpine:3.5 - -ENV GOPATH /.go -ENV GOBIN $GOPATH/bin -ENV PATH=$GOBIN:$PATH +FROM alpine ADD . /.go/src/app -RUN apk add --no-cache go curl git gcc libc-dev glide \ - && cd $GOPATH/src/app \ - && mkdir -p $GOBIN \ +RUN apk add --no-cache go curl git gcc libc-dev \ + && cd /.go/src/app \ && mkdir /barcelona \ - && glide install \ && go build -o /barcelona/barcelona-run --ldflags '-linkmode external -extldflags "-static"' \ && rm -rf /.go \ && apk del --purge go curl git gcc libc-dev diff --git a/dockerfiles/run-pack/glide.lock b/dockerfiles/run-pack/glide.lock deleted file mode 100644 index f1834a15..00000000 --- a/dockerfiles/run-pack/glide.lock +++ /dev/null @@ -1,40 +0,0 @@ -hash: b3d2bbd3574b56c9945e47ba6dbf7ac373eba8a7d966c89ea73fd766a8e6988a -updated: 2016-09-06T14:49:21.065826411+09:00 -imports: -- name: github.com/aws/aws-sdk-go - version: 6ac30507cca29249f4d49af45a8efc98b84088ee - subpackages: - - aws - - aws/awserr - - aws/awsutil - - aws/client - - aws/client/metadata - - aws/corehandlers - - aws/credentials - - aws/credentials/ec2rolecreds - - aws/credentials/endpointcreds - - aws/credentials/stscreds - - aws/defaults - - aws/ec2metadata - - aws/request - - aws/session - - aws/signer/v4 - - private/endpoints - - private/protocol - - private/protocol/query - - private/protocol/query/queryutil - - private/protocol/rest - - private/protocol/restxml - - private/protocol/xml/xmlutil - - private/waiter - - service/s3 - - service/sts -- name: github.com/go-ini/ini - version: 6e4869b434bd001f6983749881c7ead3545887d8 -- name: github.com/jmespath/go-jmespath - version: bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d -- name: github.com/mitchellh/go-ps - version: e2d21980687ce16e58469d98dcee92d27fbbd7fb -- name: github.com/urfave/cli - version: a14d7d367bc02b1f57d88de97926727f2d936387 -testImports: [] diff --git a/dockerfiles/run-pack/glide.yaml b/dockerfiles/run-pack/glide.yaml deleted file mode 100644 index b24b3718..00000000 --- a/dockerfiles/run-pack/glide.yaml +++ /dev/null @@ -1,11 +0,0 @@ -package: . -import: -- package: github.com/aws/aws-sdk-go - version: ^1.4.6 - subpackages: - - aws - - aws/session - - service/s3 -- package: github.com/mitchellh/go-ps -- package: github.com/urfave/cli - version: ^1.18.1 diff --git a/dockerfiles/run-pack/watch_interactive_session_test.go b/dockerfiles/run-pack/watch_interactive_session_test.go index a6b74404..f496935c 100644 --- a/dockerfiles/run-pack/watch_interactive_session_test.go +++ b/dockerfiles/run-pack/watch_interactive_session_test.go @@ -1,6 +1,8 @@ package main import ( + "fmt" + "log" "testing" ps "github.com/mitchellh/go-ps" @@ -24,6 +26,7 @@ func (p *ProcessMock) Executable() string { } func TestOtherSessionRunning(t *testing.T) { + log.Println(fmt.Sprintf("Interactive session has not started for %d seconds", 123)) ps1 := []ps.Process{ &ProcessMock{pid: 1, ppid: 0}, &ProcessMock{pid: 10, ppid: 1}, diff --git a/lib/barcelona/network/autoscaling_builder.rb b/lib/barcelona/network/autoscaling_builder.rb index a87f09da..e748c156 100644 --- a/lib/barcelona/network/autoscaling_builder.rb +++ b/lib/barcelona/network/autoscaling_builder.rb @@ -121,7 +121,7 @@ def build_resources end j.Handler "index.lambda_handler" - j.Runtime "python3.7" + j.Runtime "python3.12" j.Timeout "60" j.Role get_attr("ASGDrainingFunctionRole", "Arn") j.Environment do |j| diff --git a/spec/lib/barcelona/network/network_stack_spec.rb b/spec/lib/barcelona/network/network_stack_spec.rb index c19da817..8e4c7f82 100644 --- a/spec/lib/barcelona/network/network_stack_spec.rb +++ b/spec/lib/barcelona/network/network_stack_spec.rb @@ -223,7 +223,7 @@ "ZipFile" => kind_of(String) }, "Handler" => "index.lambda_handler", - "Runtime" => "python3.7", + "Runtime" => "python3.12", "Timeout" => "60", "Role" => {"Fn::GetAtt" => ["ASGDrainingFunctionRole", "Arn"]}, "Environment" => {