Skip to content

Commit 4efdcf3

Browse files
8W9aG8W9aG
authored
Revert "Ping the docker daemon to check if it is up (#1838)" (#1852)
This reverts commit 592f768.
1 parent 78abd0e commit 4efdcf3

File tree

8 files changed

+0
-81
lines changed

8 files changed

+0
-81
lines changed

‎go.mod

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ require (
4343
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
4444
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect
4545
github.com/Masterminds/semver/v3 v3.2.1 // indirect
46-
github.com/Microsoft/go-winio v0.6.1 // indirect
4746
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
4847
github.com/alecthomas/go-check-sumtype v0.1.4 // indirect
4948
github.com/alexkohler/nakedret/v2 v2.0.4 // indirect
@@ -71,7 +70,6 @@ require (
7170
github.com/daixiang0/gci v0.13.4 // indirect
7271
github.com/davecgh/go-spew v1.1.1 // indirect
7372
github.com/denis-tingaikin/go-header v0.5.0 // indirect
74-
github.com/distribution/reference v0.6.0 // indirect
7573
github.com/dnephin/pflag v1.0.7 // indirect
7674
github.com/docker/distribution v2.8.2+incompatible // indirect
7775
github.com/docker/docker-credential-helpers v0.7.0 // indirect
@@ -80,14 +78,11 @@ require (
8078
github.com/ettle/strcase v0.2.0 // indirect
8179
github.com/fatih/color v1.17.0 // indirect
8280
github.com/fatih/structtag v1.2.0 // indirect
83-
github.com/felixge/httpsnoop v1.0.4 // indirect
8481
github.com/firefart/nonamedreturns v1.0.5 // indirect
8582
github.com/fsnotify/fsnotify v1.7.0 // indirect
8683
github.com/fzipp/gocyclo v0.6.0 // indirect
8784
github.com/ghostiam/protogetter v0.3.6 // indirect
8885
github.com/go-critic/go-critic v0.11.4 // indirect
89-
github.com/go-logr/logr v1.4.2 // indirect
90-
github.com/go-logr/stdr v1.2.2 // indirect
9186
github.com/go-openapi/jsonpointer v0.21.0 // indirect
9287
github.com/go-openapi/swag v0.23.0 // indirect
9388
github.com/go-toolsmith/astcast v1.1.0 // indirect
@@ -217,10 +212,6 @@ require (
217212
gitlab.com/bosi/decorder v0.4.2 // indirect
218213
go-simpler.org/musttag v0.12.2 // indirect
219214
go-simpler.org/sloglint v0.7.1 // indirect
220-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
221-
go.opentelemetry.io/otel v1.28.0 // indirect
222-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
223-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
224215
go.uber.org/atomic v1.7.0 // indirect
225216
go.uber.org/automaxprocs v1.5.3 // indirect
226217
go.uber.org/multierr v1.6.0 // indirect

‎go.sum

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 h1:sATXp1x6/axKxz2Gjxv8M
6060
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0/go.mod h1:Nl76DrGNJTA1KJ0LePKBw/vznBX1EHbAZX8mwjR82nI=
6161
github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=
6262
github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
63-
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
64-
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
6563
github.com/OpenPeeDeeP/depguard/v2 v2.2.0 h1:vDfG60vDtIuf0MEOhmLlLLSzqaRM8EMcgJPdp74zmpA=
6664
github.com/OpenPeeDeeP/depguard/v2 v2.2.0/go.mod h1:CIzddKRvLBC4Au5aYP/i3nyaWQ+ClszLIuVocRiCYFQ=
6765
github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
@@ -143,8 +141,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
143141
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
144142
github.com/denis-tingaikin/go-header v0.5.0 h1:SRdnP5ZKvcO9KKRP1KJrhFR3RrlGuD+42t4429eC9k8=
145143
github.com/denis-tingaikin/go-header v0.5.0/go.mod h1:mMenU5bWrok6Wl2UsZjy+1okegmwQ3UgWl4V1D8gjlY=
146-
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
147-
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
148144
github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
149145
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
150146
github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE=
@@ -171,8 +167,6 @@ github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
171167
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
172168
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
173169
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
174-
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
175-
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
176170
github.com/firefart/nonamedreturns v1.0.5 h1:tM+Me2ZaXs8tfdDw3X6DOX++wMCOqzYUho6tUTYIdRA=
177171
github.com/firefart/nonamedreturns v1.0.5/go.mod h1:gHJjDqhGM4WyPt639SOZs+G89Ko7QKH5R5BhnO6xJhw=
178172
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -196,13 +190,8 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
196190
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
197191
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
198192
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
199-
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
200193
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
201194
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
202-
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
203-
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
204-
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
205-
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
206195
github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
207196
github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
208197
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
@@ -672,14 +661,6 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
672661
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
673662
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
674663
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
675-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=
676-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg=
677-
go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=
678-
go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4=
679-
go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q=
680-
go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s=
681-
go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g=
682-
go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI=
683664
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
684665
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
685666
go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=

‎pkg/cli/build.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import (
44
"fmt"
55
"os"
66
"strings"
7-
"time"
87

98
"github.com/spf13/cobra"
109
"github.com/spf13/pflag"
1110

1211
"github.com/replicate/cog/pkg/config"
13-
"github.com/replicate/cog/pkg/docker"
1412
"github.com/replicate/cog/pkg/image"
1513
"github.com/replicate/cog/pkg/util/console"
1614
)
@@ -47,10 +45,6 @@ func newBuildCommand() *cobra.Command {
4745
}
4846

4947
func buildCommand(cmd *cobra.Command, args []string) error {
50-
if err := docker.Ping(cmd.Context(), time.Second*5); err != nil {
51-
return fmt.Errorf("Failed to ping docker, please try restarting the docker daemon: %w", err)
52-
}
53-
5448
cfg, projectDir, err := config.GetConfig(projectDirFlag)
5549
if err != nil {
5650
return err

‎pkg/cli/predict.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"path/filepath"
1111
"strings"
1212
"syscall"
13-
"time"
1413

1514
"github.com/getkin/kin-openapi/openapi3"
1615
"github.com/mitchellh/go-homedir"
@@ -66,10 +65,6 @@ func cmdPredict(cmd *cobra.Command, args []string) error {
6665
volumes := []docker.Volume{}
6766
gpus := gpusFlag
6867

69-
if err := docker.Ping(cmd.Context(), time.Second*5); err != nil {
70-
return fmt.Errorf("Failed to ping docker, please try restarting the docker daemon: %w", err)
71-
}
72-
7368
if len(args) == 0 {
7469
// Build image
7570

‎pkg/cli/push.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package cli
33
import (
44
"fmt"
55
"strings"
6-
"time"
76

87
"github.com/spf13/cobra"
98

@@ -36,10 +35,6 @@ func newPushCommand() *cobra.Command {
3635
}
3736

3837
func push(cmd *cobra.Command, args []string) error {
39-
if err := docker.Ping(cmd.Context(), time.Second*5); err != nil {
40-
return fmt.Errorf("Failed to ping docker, please try restarting the docker daemon: %w", err)
41-
}
42-
4338
cfg, projectDir, err := config.GetConfig(projectDirFlag)
4439
if err != nil {
4540
return err

‎pkg/cli/run.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package cli
22

33
import (
4-
"fmt"
54
"runtime"
65
"strconv"
76
"strings"
8-
"time"
97

108
"github.com/spf13/cobra"
119

@@ -52,10 +50,6 @@ func newRunCommand() *cobra.Command {
5250
}
5351

5452
func run(cmd *cobra.Command, args []string) error {
55-
if err := docker.Ping(cmd.Context(), time.Second*5); err != nil {
56-
return fmt.Errorf("Failed to ping docker, please try restarting the docker daemon: %w", err)
57-
}
58-
5953
cfg, projectDir, err := config.GetConfig(projectDirFlag)
6054
if err != nil {
6155
return err

‎pkg/cli/train.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"os"
66
"os/signal"
77
"syscall"
8-
"time"
98

109
"github.com/spf13/cobra"
1110

@@ -51,10 +50,6 @@ Otherwise, it will build the model in the current directory and train it.`,
5150
}
5251

5352
func cmdTrain(cmd *cobra.Command, args []string) error {
54-
if err := docker.Ping(cmd.Context(), time.Second*5); err != nil {
55-
return fmt.Errorf("Failed to ping docker, please try restarting the docker daemon: %w", err)
56-
}
57-
5853
imageName := ""
5954
volumes := []docker.Volume{}
6055
gpus := gpusFlag

‎pkg/docker/ping.go

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)