fix: security k6 docker image bump (#4793)

* fix: security k6 docker image bump * fix: security k6 docker image bump - building with grafana docker image * fix: grpc logs server tests
kubeshop · Dec 19, 2023 · b898ac3 · b898ac3
1 parent 22bc40e
commit b898ac3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/contrib/executor/k6/build/agent/Dockerfile b/contrib/executor/k6/build/agent/Dockerfile
@@ -1,12 +1,10 @@
-# FROM golang:1.21 as builder
+FROM golang:1.21 as builder
 # # build k6 0.36.0 with prometheus support
-# ENV K6_VERSION=v0.44.0
-# RUN go install go.k6.io/xk6/cmd/xk6@v0.9.0 && xk6 build $K6_VERSION --with github.com/grafana/xk6-output-prometheus-remote@latest
+ENV K6_VERSION=v0.48.0
+RUN go install go.k6.io/xk6/cmd/xk6@v0.10.0 && xk6 build $K6_VERSION --with github.com/grafana/xk6-output-prometheus-remote@latest
 
 # syntax=docker/dockerfile:1
-FROM kubeshop/testkube-k6-executor:base as builder
-
-FROM grafana/k6:0.47.0
+FROM grafana/k6:0.48.0
 COPY k6 /bin/runner
 WORKDIR /home/k6
 COPY --from=builder /go/k6 /usr/bin/k6

diff --git a/pkg/logs/logsserver_test.go b/pkg/logs/logsserver_test.go
@@ -29,6 +29,9 @@ func TestGRPC_Server(t *testing.T) {
 
 	go ls.RunGRPCServer(ctx)
 
+	// allow server to splin up
+	time.Sleep(time.Millisecond * 100)
+
 	expectedCount := 0
 
 	stream := client.NewGrpcClient(ls.grpcAddress)