Skip to content

Commit a7e7d06

Browse files
committed
chore: upgrade dependency packages (#264)
1 parent 51cabb1 commit a7e7d06

File tree

9 files changed

+33
-35
lines changed

9 files changed

+33
-35
lines changed

Diff for: go.mod

+3-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/aws/aws-sdk-go v1.33.8
1010
github.com/containerd/containerd v1.5.2 // indirect
1111
github.com/docker/cli v0.0.0-20200721130541-80fd48bcb7e7
12-
github.com/docker/docker v1.13.1
12+
github.com/docker/docker v20.10.10+incompatible
1313
github.com/docker/go-connections v0.4.0
1414
github.com/docker/go-units v0.4.0
1515
github.com/dustin/go-humanize v1.0.0
@@ -20,6 +20,7 @@ require (
2020
github.com/jackc/pgtype v1.5.0
2121
github.com/jackc/pgx/v4 v4.9.0
2222
github.com/lib/pq v1.8.0
23+
github.com/moby/sys/mount v0.3.0 // indirect
2324
github.com/morikuni/aec v1.0.0 // indirect
2425
github.com/pkg/errors v0.9.1
2526
github.com/robfig/cron/v3 v3.0.1
@@ -28,12 +29,10 @@ require (
2829
github.com/sethvargo/go-password v0.2.0
2930
github.com/shirou/gopsutil v2.20.9+incompatible
3031
github.com/stretchr/testify v1.7.0
31-
github.com/testcontainers/testcontainers-go v0.8.0
32+
github.com/testcontainers/testcontainers-go v0.11.1
3233
github.com/urfave/cli/v2 v2.1.1
3334
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
3435
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
3536
google.golang.org/grpc v1.38.0 // indirect
3637
gopkg.in/yaml.v2 v2.4.0
3738
)
38-
39-
replace github.com/docker/docker v1.13.1 => github.com/docker/engine v0.0.0-20200618181300-9dc6525e6118

Diff for: go.sum

+23-28
Large diffs are not rendered by default.

Diff for: internal/localui/local_ui.go

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ func (ui *UIManager) Run(ctx context.Context) error {
120120
},
121121
},
122122
&network.NetworkingConfig{},
123+
nil,
123124
getLocalUIName(ui.engProps.InstanceID),
124125
)
125126

Diff for: internal/retrieval/engine/postgres/logical/dump.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ func (d *DumpJob) Run(ctx context.Context) (err error) {
270270
}
271271

272272
dumpCont, err := d.dockerClient.ContainerCreate(ctx, d.buildContainerConfig(pwd), hostConfig, &network.NetworkingConfig{},
273-
d.dumpContainerName(),
273+
nil, d.dumpContainerName(),
274274
)
275275
if err != nil {
276276
log.Err(err)

Diff for: internal/retrieval/engine/postgres/logical/restore.go

+1
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ func (r *RestoreJob) Run(ctx context.Context) (err error) {
199199
r.buildContainerConfig(pwd),
200200
hostConfig,
201201
&network.NetworkingConfig{},
202+
nil,
202203
r.restoreContainerName(),
203204
)
204205
if err != nil {

Diff for: internal/retrieval/engine/postgres/physical/physical.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ func (r *RestoreJob) startContainer(ctx context.Context, containerName string, c
279279
return "", err
280280
}
281281

282-
newContainer, err := r.dockerClient.ContainerCreate(ctx, containerConfig, hostConfig, &network.NetworkingConfig{},
282+
newContainer, err := r.dockerClient.ContainerCreate(ctx, containerConfig, hostConfig, &network.NetworkingConfig{}, nil,
283283
containerName)
284284
if err != nil {
285285
return "", errors.Wrapf(err, "failed to create container %s", containerName)

Diff for: internal/retrieval/engine/postgres/snapshot/logical.go

+1
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ func (s *LogicalInitial) runPreprocessingQueries(ctx context.Context, dataDir st
198198
s.buildContainerConfig(dataDir, patchImage, pwd),
199199
hostConfig,
200200
&network.NetworkingConfig{},
201+
nil,
201202
s.patchContainerName(),
202203
)
203204
if err != nil {

Diff for: internal/retrieval/engine/postgres/snapshot/physical.go

+1
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ func (p *PhysicalInitial) promoteInstance(ctx context.Context, clonePath string,
543543
p.buildContainerConfig(clonePath, promoteImage, pwd, recoveryConfig[targetActionOption]),
544544
hostConfig,
545545
&network.NetworkingConfig{},
546+
nil,
546547
p.promoteContainerName(),
547548
)
548549

Diff for: internal/runci/handlers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func (s *Server) runCommands(ctx context.Context, clone *models.Clone, runID str
191191
networkConfig.EndpointsConfig = map[string]*network.EndpointSettings{"clone_network": {NetworkID: s.networkID}}
192192
}
193193

194-
contRunner, err := s.docker.ContainerCreate(ctx, containerCfg, hostConfig, networkConfig, containerName)
194+
contRunner, err := s.docker.ContainerCreate(ctx, containerCfg, hostConfig, networkConfig, nil, containerName)
195195

196196
if err != nil {
197197
return nil, errors.Wrap(err, "failed to create container")

0 commit comments

Comments
 (0)