@@ -3,7 +3,6 @@ package testcontainers
33import (
44 "archive/tar"
55 "bufio"
6- "bytes"
76 "context"
87 "encoding/base64"
98 "encoding/binary"
@@ -12,6 +11,7 @@ import (
1211 "fmt"
1312 "io"
1413 "io/fs"
14+ "net"
1515 "net/url"
1616 "os"
1717 "path/filepath"
@@ -156,7 +156,7 @@ func (c *DockerContainer) PortEndpoint(ctx context.Context, port nat.Port, proto
156156
157157// Host gets host (ip or name) of the docker daemon where the container port is exposed
158158// Warning: this is based on your Docker host setting. Will fail if using an SSH tunnel
159- // You can use the "TC_HOST " env variable to set this yourself
159+ // You can use the "TESTCONTAINERS_HOST_OVERRIDE " env variable to set this yourself
160160func (c * DockerContainer ) Host (ctx context.Context ) (string , error ) {
161161 host , err := c .provider .DaemonHost (ctx )
162162 if err != nil {
@@ -507,7 +507,7 @@ func (c *DockerContainer) Exec(ctx context.Context, cmd []string, options ...tce
507507 return 0 , nil , err
508508 }
509509
510- hijack , err := cli .ContainerExecAttach (ctx , response .ID , types. ExecStartCheck {})
510+ hijack , err := cli .ContainerExecAttach (ctx , response .ID , container. ExecAttachOptions {})
511511 if err != nil {
512512 return 0 , nil , err
513513 }
@@ -596,7 +596,7 @@ func (c *DockerContainer) CopyDirToContainer(ctx context.Context, hostDirPath st
596596 // create the directory under its parent
597597 parent := filepath .Dir (containerParentPath )
598598
599- err = c .provider .client .CopyToContainer (ctx , c .ID , parent , buff , types .CopyToContainerOptions {})
599+ err = c .provider .client .CopyToContainer (ctx , c .ID , parent , buff , container .CopyToContainerOptions {})
600600 if err != nil {
601601 return err
602602 }
@@ -654,7 +654,7 @@ func (c *DockerContainer) copyToContainer(ctx context.Context, fileContent func(
654654 return err
655655 }
656656
657- err = c .provider .client .CopyToContainer (ctx , c .ID , "/" , buffer , types .CopyToContainerOptions {})
657+ err = c .provider .client .CopyToContainer (ctx , c .ID , "/" , buffer , container .CopyToContainerOptions {})
658658 if err != nil {
659659 return err
660660 }
@@ -742,57 +742,59 @@ func (c *DockerContainer) startLogProduction(ctx context.Context, opts ...LogPro
742742 c .logProductionError <- r .Close ()
743743 return
744744 default :
745- h := make ([]byte , 8 )
746- _ , err := io .ReadFull (r , h )
747- if err != nil {
748- // proper type matching requires https://go-review.googlesource.com/c/go/+/250357/ (go 1.16)
749- if strings .Contains (err .Error (), "use of closed network connection" ) {
750- now := time .Now ()
751- since = fmt .Sprintf ("%d.%09d" , now .Unix (), int64 (now .Nanosecond ()))
752- goto BEGIN
753- }
754- if errors .Is (err , context .DeadlineExceeded ) || errors .Is (err , context .Canceled ) {
755- // Probably safe to continue here
756- continue
757- }
745+ }
746+ h := make ([]byte , 8 )
747+ _ , err := io .ReadFull (r , h )
748+ if err != nil {
749+ switch {
750+ case err == io .EOF :
751+ // No more logs coming
752+ case errors .Is (err , net .ErrClosed ):
753+ now := time .Now ()
754+ since = fmt .Sprintf ("%d.%09d" , now .Unix (), int64 (now .Nanosecond ()))
755+ goto BEGIN
756+ case errors .Is (err , context .DeadlineExceeded ) || errors .Is (err , context .Canceled ):
757+ // Probably safe to continue here
758+ continue
759+ default :
758760 _ , _ = fmt .Fprintf (os .Stderr , "container log error: %+v. %s" , err , logStoppedForOutOfSyncMessage )
759761 // if we would continue here, the next header-read will result into random data...
760- return
761762 }
763+ return
764+ }
762765
763- count := binary .BigEndian .Uint32 (h [4 :])
764- if count == 0 {
765- continue
766- }
767- logType := h [0 ]
768- if logType > 2 {
769- _ , _ = fmt .Fprintf (os .Stderr , "received invalid log type: %d" , logType )
770- // sometimes docker returns logType = 3 which is an undocumented log type, so treat it as stdout
771- logType = 1
772- }
766+ count := binary .BigEndian .Uint32 (h [4 :])
767+ if count == 0 {
768+ continue
769+ }
770+ logType := h [0 ]
771+ if logType > 2 {
772+ _ , _ = fmt .Fprintf (os .Stderr , "received invalid log type: %d" , logType )
773+ // sometimes docker returns logType = 3 which is an undocumented log type, so treat it as stdout
774+ logType = 1
775+ }
773776
774- // a map of the log type --> int representation in the header, notice the first is blank, this is stdin, but the go docker client doesn't allow following that in logs
775- logTypes := []string {"" , StdoutLog , StderrLog }
777+ // a map of the log type --> int representation in the header, notice the first is blank, this is stdin, but the go docker client doesn't allow following that in logs
778+ logTypes := []string {"" , StdoutLog , StderrLog }
776779
777- b := make ([]byte , count )
778- _ , err = io .ReadFull (r , b )
779- if err != nil {
780- // TODO: add-logger: use logger to log out this error
781- _ , _ = fmt .Fprintf (os .Stderr , "error occurred reading log with known length %s" , err .Error ())
782- if errors .Is (err , context .DeadlineExceeded ) || errors .Is (err , context .Canceled ) {
783- // Probably safe to continue here
784- continue
785- }
786- // we can not continue here as the next read most likely will not be the next header
787- _ , _ = fmt .Fprintln (os .Stderr , logStoppedForOutOfSyncMessage )
788- return
789- }
790- for _ , c := range c .consumers {
791- c .Accept (Log {
792- LogType : logTypes [logType ],
793- Content : b ,
794- })
780+ b := make ([]byte , count )
781+ _ , err = io .ReadFull (r , b )
782+ if err != nil {
783+ // TODO: add-logger: use logger to log out this error
784+ _ , _ = fmt .Fprintf (os .Stderr , "error occurred reading log with known length %s" , err .Error ())
785+ if errors .Is (err , context .DeadlineExceeded ) || errors .Is (err , context .Canceled ) {
786+ // Probably safe to continue here
787+ continue
795788 }
789+ // we can not continue here as the next read most likely will not be the next header
790+ _ , _ = fmt .Fprintln (os .Stderr , logStoppedForOutOfSyncMessage )
791+ return
792+ }
793+ for _ , c := range c .consumers {
794+ c .Accept (Log {
795+ LogType : logTypes [logType ],
796+ Content : b ,
797+ })
796798 }
797799 }
798800 }()
@@ -881,6 +883,9 @@ var _ ContainerProvider = (*DockerProvider)(nil)
881883// BuildImage will build and image from context and Dockerfile, then return the tag
882884func (p * DockerProvider ) BuildImage (ctx context.Context , img ImageBuildInfo ) (string , error ) {
883885 buildOptions , err := img .BuildOptions ()
886+ if err != nil {
887+ return "" , err
888+ }
884889
885890 var buildError error
886891 var resp types.ImageBuildResponse
@@ -912,8 +917,7 @@ func (p *DockerProvider) BuildImage(ctx context.Context, img ImageBuildInfo) (st
912917
913918 // need to read the response from Docker, I think otherwise the image
914919 // might not finish building before continuing to execute here
915- buf := new (bytes.Buffer )
916- _ , err = buf .ReadFrom (resp .Body )
920+ _ , err = io .Copy (io .Discard , resp .Body )
917921 if err != nil {
918922 return "" , err
919923 }
@@ -1337,7 +1341,7 @@ func (p *DockerProvider) Config() TestcontainersConfig {
13371341
13381342// DaemonHost gets the host or ip of the Docker daemon where ports are exposed on
13391343// Warning: this is based on your Docker host setting. Will fail if using an SSH tunnel
1340- // You can use the "TC_HOST " env variable to set this yourself
1344+ // You can use the "TESTCONTAINERS_HOST_OVERRIDE " env variable to set this yourself
13411345func (p * DockerProvider ) DaemonHost (ctx context.Context ) (string , error ) {
13421346 return daemonHost (ctx , p )
13431347}
@@ -1347,7 +1351,7 @@ func daemonHost(ctx context.Context, p *DockerProvider) (string, error) {
13471351 return p .hostCache , nil
13481352 }
13491353
1350- host , exists := os .LookupEnv ("TC_HOST " )
1354+ host , exists := os .LookupEnv ("TESTCONTAINERS_HOST_OVERRIDE " )
13511355 if exists {
13521356 p .hostCache = host
13531357 return p .hostCache , nil
@@ -1405,7 +1409,7 @@ func (p *DockerProvider) CreateNetwork(ctx context.Context, req NetworkRequest)
14051409
14061410 tcConfig := p .Config ().Config
14071411
1408- nc := types. NetworkCreate {
1412+ nc := network. CreateOptions {
14091413 Driver : req .Driver ,
14101414 Internal : req .Internal ,
14111415 EnableIPv6 : req .EnableIPv6 ,
@@ -1460,12 +1464,12 @@ func (p *DockerProvider) CreateNetwork(ctx context.Context, req NetworkRequest)
14601464}
14611465
14621466// GetNetwork returns the object representing the network identified by its name
1463- func (p * DockerProvider ) GetNetwork (ctx context.Context , req NetworkRequest ) (types. NetworkResource , error ) {
1464- networkResource , err := p .client .NetworkInspect (ctx , req .Name , types. NetworkInspectOptions {
1467+ func (p * DockerProvider ) GetNetwork (ctx context.Context , req NetworkRequest ) (network. Inspect , error ) {
1468+ networkResource , err := p .client .NetworkInspect (ctx , req .Name , network. InspectOptions {
14651469 Verbose : true ,
14661470 })
14671471 if err != nil {
1468- return types. NetworkResource {}, err
1472+ return network. Inspect {}, err
14691473 }
14701474
14711475 return networkResource , err
@@ -1501,7 +1505,7 @@ func (p *DockerProvider) GetGatewayIP(ctx context.Context) (string, error) {
15011505
15021506func (p * DockerProvider ) getDefaultNetwork (ctx context.Context , cli client.APIClient ) (string , error ) {
15031507 // Get list of available networks
1504- networkResources , err := cli .NetworkList (ctx , types. NetworkListOptions {})
1508+ networkResources , err := cli .NetworkList (ctx , network. ListOptions {})
15051509 if err != nil {
15061510 return "" , err
15071511 }
@@ -1522,7 +1526,7 @@ func (p *DockerProvider) getDefaultNetwork(ctx context.Context, cli client.APICl
15221526
15231527 // Create a bridge network for the container communications
15241528 if ! reaperNetworkExists {
1525- _ , err = cli .NetworkCreate (ctx , reaperNetwork , types. NetworkCreate {
1529+ _ , err = cli .NetworkCreate (ctx , reaperNetwork , network. CreateOptions {
15261530 Driver : Bridge ,
15271531 Attachable : true ,
15281532 Labels : core .DefaultLabels (core .SessionID ()),
0 commit comments