Merge branch 'main' into v1

* main:
  chore: test cleanups (#2608)

image/build.go

@@ -1,7 +1,6 @@
 package image
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"io"
@@ -71,8 +70,7 @@ func Build(ctx context.Context, img BuildInfo) (string, error) {
 
 	// need to read the response from Docker, I think otherwise the image
 	// might not finish building before continuing to execute here
-	buf := new(bytes.Buffer)
-	_, err = buf.ReadFrom(resp.Body)
+	_, err = io.Copy(io.Discard, resp.Body)
 	if err != nil {
 		return "", err
 	}

options_test.go

@@ -90,11 +90,14 @@ func TestWithLogConsumers(t *testing.T) {
 	c, err := testcontainers.Run(context.Background(), req)
 	// we expect an error because the MySQL environment variables are not set
 	// but this is expected because we just want to test the log consumer
-	require.Error(t, err)
-	defer func() {
-		err = c.Terminate(context.Background())
-		require.NoError(t, err)
-	}()
+	require.EqualError(t, err, "failed to start container: container exited with code 1")
+	// c might be not nil even on error
+	if c != nil {
+		defer func() {
+			err = c.Terminate(context.Background())
+			require.NoError(t, err)
+		}()
+	}
 
 	assert.NotEmpty(t, lc1.msgs)
 	assert.NotEmpty(t, lc2.msgs)