Skip to content

Commit ab531df

Browse files
authored
fix: upgrade Docker SDK to v25 for API version 1.44 compatibility (#62)
* fix invalid docker version Signed-off-by: segunjkf <sege.timz12@gmail.com> * test push image Signed-off-by: segunjkf <sege.timz12@gmail.com> * fix login Signed-off-by: segunjkf <sege.timz12@gmail.com> * Refine Docker Hub login and push conditions Updated conditions for Docker Hub login and image push. --------- Signed-off-by: segunjkf <sege.timz12@gmail.com>
1 parent 99a8955 commit ab531df

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

go.mod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,7 @@ require (
659659
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
660660
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
661661
github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
662+
github.com/distribution/reference v0.6.0 // indirect
662663
github.com/drone/envsubst v1.0.3 // indirect
663664
github.com/emicklei/dot v1.6.4 // indirect
664665
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
@@ -690,6 +691,7 @@ require (
690691
github.com/minio/sha256-simd v1.0.1 // indirect
691692
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
692693
github.com/mmcloughlin/addchain v0.4.0 // indirect
694+
github.com/moby/sys/user v0.4.0 // indirect
693695
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.96.0 // indirect
694696
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.96.0 // indirect
695697
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.96.0 // indirect
@@ -784,6 +786,11 @@ replace (
784786

785787
// TODO(rfratto): remove forks when changes are merged upstream
786788
replace (
789+
// Force Docker SDK to v25+ to fix API version mismatch with newer Docker daemons.
790+
// Docker v29+ requires minimum API version 1.44, but SDK v24.x defaults to 1.43.
791+
// See: https://github.com/moby/moby/issues/45935
792+
github.com/docker/docker => github.com/docker/docker v25.0.6+incompatible
793+
787794
// TODO(tpaschalis) this is to remove global instantiation of plugins
788795
// and allow non-singleton components.
789796
// https://github.com/grafana/cadvisor/tree/grafana-v0.47-noglobals

go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,8 @@ github.com/digitalocean/godo v1.104.1/go.mod h1:VAI/L5YDzMuPRU01lEEUSQ/sp5Z//1Hn
600600
github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
601601
github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U=
602602
github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
603+
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
604+
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
603605
github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
604606
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
605607
github.com/docker/cli v20.10.11+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
@@ -608,10 +610,8 @@ github.com/docker/cli v23.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvM
608610
github.com/docker/distribution v2.6.0-rc.1.0.20170726174610-edc3ab29cdff+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
609611
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
610612
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
611-
github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
612-
github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
613-
github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0=
614-
github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
613+
github.com/docker/docker v25.0.6+incompatible h1:5cPwbwriIcsua2REJe8HqQV+6WlWc1byg2QSXzBxBGg=
614+
github.com/docker/docker v25.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
615615
github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
616616
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
617617
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -1735,6 +1735,8 @@ github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vyg
17351735
github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
17361736
github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
17371737
github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
1738+
github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs=
1739+
github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
17381740
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
17391741
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
17401742
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=

0 commit comments

Comments
 (0)