Merge branch 'main' into develop

# Conflicts:
#	internal/adapters/docker.go

Author: dploeger

internal/adapters/docker.go

@@ -16,7 +16,6 @@ import (
 	"github.com/docker/docker/client"
 	resty "github.com/go-resty/resty/v2"
 	"github.com/moby/term"
-	"github.com/sirupsen/logrus"
 	"io"
 	"net"
 	"os"