Revert "[supervisor] improve docker activation (#18143)"

components/supervisor/go.mod

@@ -24,6 +24,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
 	github.com/improbable-eng/grpc-web v0.14.0
+	github.com/mailru/easygo v0.0.0-20190618140210-3c14a0dc985f
 	github.com/prometheus/client_golang v1.14.0
 	github.com/prometheus/client_model v0.3.0
 	github.com/prometheus/common v0.42.0
@@ -115,7 +116,6 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/moredure/easygo v0.0.0-20220122214504-21cd2ebdd15b
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/opencontainers/runtime-spec v1.0.2 // indirect

components/supervisor/pkg/activation/activation.go

@@ -10,8 +10,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/gitpod-io/gitpod/common-go/log"
-	"github.com/moredure/easygo/netpoll"
+	"github.com/mailru/easygo/netpoll"
 	"golang.org/x/xerrors"
 )
 
@@ -20,22 +19,16 @@ type Callback func(socketFD *os.File) error
 
 // Listen polls on the listener and calls callback when someone writes to it.
 func Listen(ctx context.Context, l net.Listener, activate Callback) error {
-	poller, err := netpoll.New(&netpoll.Config{
-		OnWaitError: func(err error) {
-			log.WithError(err).Error("netpoll: wait loop error")
-		},
-	})
+	poller, err := netpoll.New(nil)
 	if err != nil {
 		return err
 	}
-	defer poller.Close()
 
 	// Get netpoll descriptor with EventRead|EventEdgeTriggered.
 	desc, err := netpoll.HandleListener(l, netpoll.EventRead|netpoll.EventEdgeTriggered)
 	if err != nil {
 		return err
 	}
-	defer desc.Close()
 
 	var (
 		runc = make(chan bool, 1)