Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FIX (verification): migrate Docker SDK to moby/moby/{client,api} v29 to clear three high-severity advisories

Rostislav Dugin37f274b29ee0
diff --git a/agent/verification/go.mod b/agent/verification/go.mod
index 9534331a..c137abf2 100644
--- a/agent/verification/go.mod
+++ b/agent/verification/go.mod
@@ -3,11 +3,11 @@ module databasus-verification-agent
go 1.26.3
require (
- github.com/docker/docker v28.5.2+incompatible
- github.com/docker/go-connections v0.5.0
github.com/go-resty/resty/v2 v2.17.2
github.com/google/uuid v1.6.0
github.com/jackc/pgx/v5 v5.9.2
+ github.com/moby/moby/api v1.54.2
+ github.com/moby/moby/client v0.4.1
github.com/stretchr/testify v1.11.1
)
@@ -16,9 +16,9 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
- github.com/containerd/log v0.1.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
+ github.com/docker/go-connections v0.7.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.3 // indirect
@@ -26,22 +26,16 @@ require (
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
- github.com/moby/sys/atomicwriter v0.1.0 // indirect
- github.com/moby/term v0.5.2 // indirect
- github.com/morikuni/aec v1.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
- github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
golang.org/x/net v0.52.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/text v0.35.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
- gotest.tools/v3 v3.5.2 // indirect
)
diff --git a/agent/verification/go.sum b/agent/verification/go.sum
index 63452a37..2fafd06e 100644
--- a/agent/verification/go.sum
+++ b/agent/verification/go.sum
@@ -1,26 +1,18 @@
-github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
-github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM=
-github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw=
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
-github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
-github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftjlSWt4AFexzM=
-github.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
-github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
+github.com/docker/go-connections v0.7.0 h1:6SsRfJddP22WMrCkj19x9WKjEDTB+ahsdiGYf0mN39c=
+github.com/docker/go-connections v0.7.0/go.mod h1:no1qkHdjq7kLMGUXYAduOhYPSJxxvgWBh7ogVvptn3Q=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -36,8 +28,6 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@@ -52,26 +42,18 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
-github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
-github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
-github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
-github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
-github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
-github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
-github.com/morikuni/aec v1.1.0 h1:vBBl0pUnvi/Je71dsRrhMBtreIqNMYErSAbEeb8jrXQ=
-github.com/morikuni/aec v1.1.0/go.mod h1:xDRgiq/iw5l+zkao76YTKzKttOp2cwPEne25HDkJnBw=
+github.com/moby/moby/api v1.54.2 h1:wiat9QAhnDQjA7wk1kh/TqHz2I1uUA7M7t9SAl/JNXg=
+github.com/moby/moby/api v1.54.2/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs=
+github.com/moby/moby/client v0.4.1 h1:DMQgisVoMkmMs7fp3ROSdiBnoAu8+vo3GggFl06M/wY=
+github.com/moby/moby/client v0.4.1/go.mod h1:z52C9O2POPOsnxZAy//WtKcQ32P+jT/NGeXu/7nfjGQ=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -83,10 +65,6 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 h1:CqXxU8V
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0/go.mod h1:BuhAPThV8PBHBvg8ZzZ/Ok3idOdhWIodywz2xEcRbJo=
go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 h1:88Y4s2C8oTui1LGM6bTWkw0ICGcOLCAI5l6zsD1j20k=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0/go.mod h1:Vl1/iaggsuRlrHf/hfPJPvVag77kKyvrLeD10kpMl+A=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 h1:3iZJKlCZufyRzPzlQhUIWVmfltrXuGyfjREgGP3UUjc=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0/go.mod h1:/G+nUPfhq2e+qiXMGxMwumDrP5jtzU+mWN7/sjT2rak=
go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
@@ -95,8 +73,6 @@ go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfC
go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
-go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
-go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
@@ -107,14 +83,6 @@ golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
-google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
-google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
-google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -123,3 +91,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
+pgregory.net/rapid v1.2.0 h1:keKAYRcjm+e1F0oAuU5F5+YPAWcyxNNRK2wud503Gnk=
+pgregory.net/rapid v1.2.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
diff --git a/agent/verification/internal/features/container/dockerengine.go b/agent/verification/internal/features/container/dockerengine.go
index 4626d41a..3a5ec855 100644
--- a/agent/verification/internal/features/container/dockerengine.go
+++ b/agent/verification/internal/features/container/dockerengine.go
@@ -8,16 +8,14 @@ import (
"context"
"fmt"
"io"
+ "net/netip"
"strconv"
"strings"
- "github.com/docker/docker/api/types/container"
- "github.com/docker/docker/api/types/filters"
- "github.com/docker/docker/api/types/image"
- "github.com/docker/docker/api/types/network"
- "github.com/docker/docker/client"
- "github.com/docker/docker/pkg/stdcopy"
- "github.com/docker/go-connections/nat"
+ "github.com/moby/moby/api/pkg/stdcopy"
+ "github.com/moby/moby/api/types/container"
+ "github.com/moby/moby/api/types/network"
+ "github.com/moby/moby/client"
"databasus-verification-agent/internal/features/restore"
)
@@ -35,12 +33,25 @@ const (
pgInternalPort = 5432
)
+// pgPublishedPort is the parsed network.Port key reused for ExposedPorts and
+// PortBindings; ParsePort is the only constructor in the new SDK.
+var pgPublishedPort = mustParsePort(strconv.Itoa(pgInternalPort) + "/tcp")
+
+func mustParsePort(s string) network.Port {
+ p, err := network.ParsePort(s)
+ if err != nil {
+ panic(fmt.Sprintf("parse port %q: %v", s, err))
+ }
+
+ return p
+}
+
type dockerEngine struct {
cli *client.Client
}
func NewDockerEngine() (*dockerEngine, error) {
- cli, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
+ cli, err := client.New(client.FromEnv)
if err != nil {
return nil, fmt.Errorf("create docker client: %w", err)
}
@@ -49,17 +60,17 @@ func NewDockerEngine() (*dockerEngine, error) {
}
func (e *dockerEngine) Ping(ctx context.Context) error {
- _, err := e.cli.Ping(ctx)
+ _, err := e.cli.Ping(ctx, client.PingOptions{})
return err
}
func (e *dockerEngine) UserNSRemapEnabled(ctx context.Context) (bool, error) {
- info, err := e.cli.Info(ctx)
+ info, err := e.cli.Info(ctx, client.InfoOptions{})
if err != nil {
return false, err
}
- for _, opt := range info.SecurityOptions {
+ for _, opt := range info.Info.SecurityOptions {
if strings.Contains(opt, "name=userns") {
return true, nil
}
@@ -73,7 +84,7 @@ func (e *dockerEngine) EnsureImage(ctx context.Context, ref string) error {
return nil
}
- reader, err := e.cli.ImagePull(ctx, ref, image.PullOptions{})
+ reader, err := e.cli.ImagePull(ctx, ref, client.ImagePullOptions{})
if err != nil {
return fmt.Errorf("image pull: %w", err)
}
@@ -96,7 +107,7 @@ func (e *dockerEngine) CreateNetwork(
// doc). Outbound from PG to the host network is therefore not blocked at
// the docker layer; rely on the host firewall + the other hardening
// controls (cap-drop, no-new-privs, pids/memory, ephemeral, userns).
- resp, err := e.cli.NetworkCreate(ctx, name, network.CreateOptions{
+ resp, err := e.cli.NetworkCreate(ctx, name, client.NetworkCreateOptions{
Driver: "bridge",
Labels: labels,
})
@@ -108,12 +119,11 @@ func (e *dockerEngine) CreateNetwork(
}
func (e *dockerEngine) RemoveNetwork(ctx context.Context, networkID string) error {
- return e.cli.NetworkRemove(ctx, networkID)
+ _, err := e.cli.NetworkRemove(ctx, networkID, client.NetworkRemoveOptions{})
+ return err
}
func (e *dockerEngine) CreateContainer(ctx context.Context, spec SpawnSpec) (string, error) {
- port := nat.Port(strconv.Itoa(pgInternalPort) + "/tcp")
-
securityOpt := []string{}
if spec.NoNewPrivileges {
securityOpt = append(securityOpt, "no-new-privileges")
@@ -136,8 +146,10 @@ func (e *dockerEngine) CreateContainer(ctx context.Context, spec SpawnSpec) (str
CapAdd: spec.CapAdd,
ReadonlyRootfs: spec.ReadonlyRootfs,
NetworkMode: container.NetworkMode(spec.NetworkID),
- PortBindings: nat.PortMap{
- port: []nat.PortBinding{{HostIP: "127.0.0.1", HostPort: "0"}},
+ PortBindings: network.PortMap{
+ pgPublishedPort: []network.PortBinding{
+ {HostIP: netip.MustParseAddr("127.0.0.1"), HostPort: "0"},
+ },
},
Resources: container.Resources{
NanoCPUs: spec.NanoCPUs,
@@ -146,14 +158,16 @@ func (e *dockerEngine) CreateContainer(ctx context.Context, spec SpawnSpec) (str
},
}
- resp, err := e.cli.ContainerCreate(ctx,
- &container.Config{
+ resp, err := e.cli.ContainerCreate(ctx, client.ContainerCreateOptions{
+ Config: &container.Config{
Image: spec.Image,
Env: spec.Env,
Labels: spec.Labels,
- ExposedPorts: nat.PortSet{port: struct{}{}},
+ ExposedPorts: network.PortSet{pgPublishedPort: struct{}{}},
},
- hostConfig, nil, nil, spec.Name)
+ HostConfig: hostConfig,
+ Name: spec.Name,
+ })
if err != nil {
return "", err
}
@@ -162,18 +176,24 @@ func (e *dockerEngine) CreateContainer(ctx context.Context, spec SpawnSpec) (str
}
func (e *dockerEngine) StartContainer(ctx context.Context, containerID string) error {
- return e.cli.ContainerStart(ctx, containerID, container.StartOptions{})
+ _, err := e.cli.ContainerStart(ctx, containerID, client.ContainerStartOptions{})
+ return err
}
func (e *dockerEngine) HostPort(
ctx context.Context, containerID, containerPort string,
) (int, error) {
- insp, err := e.cli.ContainerInspect(ctx, containerID)
+ insp, err := e.cli.ContainerInspect(ctx, containerID, client.ContainerInspectOptions{})
if err != nil {
return 0, err
}
- bindings, ok := insp.NetworkSettings.Ports[nat.Port(containerPort)]
+ requestedPort, err := network.ParsePort(containerPort)
+ if err != nil {
+ return 0, fmt.Errorf("parse container port %q: %w", containerPort, err)
+ }
+
+ bindings, ok := insp.Container.NetworkSettings.Ports[requestedPort]
if !ok || len(bindings) == 0 {
return 0, fmt.Errorf("container port %s is not published", containerPort)
}
@@ -184,27 +204,27 @@ func (e *dockerEngine) HostPort(
func (e *dockerEngine) InspectSecurity(
ctx context.Context, containerID string,
) (SecurityState, error) {
- insp, err := e.cli.ContainerInspect(ctx, containerID)
+ insp, err := e.cli.ContainerInspect(ctx, containerID, client.ContainerInspectOptions{})
if err != nil {
return SecurityState{}, err
}
state := SecurityState{
- ReadonlyRootfs: insp.HostConfig.ReadonlyRootfs,
+ ReadonlyRootfs: insp.Container.HostConfig.ReadonlyRootfs,
// Only flag mounts the AGENT requested. insp.Mounts (runtime) includes
// image-declared anonymous volumes (postgres:16 declares VOLUME
// /var/lib/postgresql/data for PGDATA) that we explicitly want; only
// host bind mounts from our spec are a hardening regression.
- HasHostBinds: len(insp.HostConfig.Binds) > 0 || len(insp.HostConfig.Mounts) > 0,
+ HasHostBinds: len(insp.Container.HostConfig.Binds) > 0 || len(insp.Container.HostConfig.Mounts) > 0,
}
- for _, opt := range insp.HostConfig.SecurityOpt {
+ for _, opt := range insp.Container.HostConfig.SecurityOpt {
if strings.Contains(opt, "no-new-privileges") {
state.NoNewPrivileges = true
}
}
- for _, cap := range insp.HostConfig.CapDrop {
+ for _, cap := range insp.Container.HostConfig.CapDrop {
if cap == "ALL" {
state.CapDropAll = true
}
@@ -220,7 +240,7 @@ func (e *dockerEngine) Exec(
stdin io.Reader,
env []string,
) (restore.ExecResult, error) {
- created, err := e.cli.ContainerExecCreate(ctx, containerID, container.ExecOptions{
+ created, err := e.cli.ExecCreate(ctx, containerID, client.ExecCreateOptions{
Cmd: cmd,
Env: env,
AttachStdin: stdin != nil,
@@ -231,7 +251,7 @@ func (e *dockerEngine) Exec(
return restore.ExecResult{}, fmt.Errorf("exec create: %w", err)
}
- attached, err := e.cli.ContainerExecAttach(ctx, created.ID, container.ExecAttachOptions{})
+ attached, err := e.cli.ExecAttach(ctx, created.ID, client.ExecAttachOptions{})
if err != nil {
return restore.ExecResult{}, fmt.Errorf("exec attach: %w", err)
}
@@ -263,7 +283,7 @@ func (e *dockerEngine) Exec(
return restore.ExecResult{}, fmt.Errorf("exec stream copy: %w", err)
}
- inspect, err := e.cli.ContainerExecInspect(ctx, created.ID)
+ inspect, err := e.cli.ExecInspect(ctx, created.ID, client.ExecInspectOptions{})
if err != nil {
return restore.ExecResult{}, fmt.Errorf("exec inspect: %w", err)
}
@@ -276,36 +296,38 @@ func (e *dockerEngine) Exec(
}
func (e *dockerEngine) RemoveContainer(ctx context.Context, containerID string) error {
- return e.cli.ContainerRemove(ctx, containerID, container.RemoveOptions{
+ _, err := e.cli.ContainerRemove(ctx, containerID, client.ContainerRemoveOptions{
Force: true,
RemoveVolumes: true,
})
+ return err
}
func (e *dockerEngine) ListManaged(
ctx context.Context, agentID string,
) ([]ManagedContainer, error) {
- summaries, err := e.cli.ContainerList(ctx, container.ListOptions{
- All: true,
- Filters: filters.NewArgs(
- filters.Arg("label", LabelAgentID+"="+agentID)),
+ listed, err := e.cli.ContainerList(ctx, client.ContainerListOptions{
+ All: true,
+ Filters: make(client.Filters).Add("label", LabelAgentID+"="+agentID),
})
if err != nil {
return nil, err
}
- managed := make([]ManagedContainer, 0, len(summaries))
- for _, s := range summaries {
+ managed := make([]ManagedContainer, 0, len(listed.Items))
+ for _, s := range listed.Items {
mc := ManagedContainer{
ID: s.ID,
VerificationID: s.Labels[LabelVerificationID],
CreatedUnix: s.Created,
}
- for _, endpoint := range s.NetworkSettings.Networks {
- if endpoint.NetworkID != "" {
- mc.NetworkID = endpoint.NetworkID
- break
+ if s.NetworkSettings != nil {
+ for _, endpoint := range s.NetworkSettings.Networks {
+ if endpoint.NetworkID != "" {
+ mc.NetworkID = endpoint.NetworkID
+ break
+ }
}
}