From 709bcedb247a6c012b399b010fc716061e6e625c Mon Sep 17 00:00:00 2001 From: Leo Antunes Date: Tue, 26 Nov 2019 15:02:36 +0100 Subject: [PATCH] fix building with non-go-mod docker libs --- .travis.yml | 3 +-- go.mod | 7 +++++++ go.sum | 6 ++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b38ff1..7859729 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: go dist: xenial go: - - "1.11" + - "1.13" - "1.x" - "master" @@ -36,7 +36,6 @@ jobs: script: skip env: - secure: "FOx2FP9HJs1AupPp2yZ84z5yaPwYSRAaT2OGoRf/RAgRtzxF0qZdi9T/IBu5Kz5b1IyMWvteIjEj2PFyKjRTkn9mASzPnk0+ymtfxdxm34TM0gXfy/3WgG4W90bNeiX3ZQ8cXliwBvBIe7HYfRz9733Q1Mh2P2NVhtWi/PlPelDbvtvTVnEArrveXln/HbnDhjVN3MdPc4eCZymQT4QtcuQ89ERdFqVGaOYGevMAYaaGJ2BgsT8I41YDCs+TkuLA3cbZmDp4Q2DvRoLrPW2MJh6fwmql+3pButDvehNE+I4OL+R1d7kWEhY9ikzvsp0x5dxyEf2PBBDv2A2z8cGb0MfQFhPvwtlc5drDrv9psqGrNjBZZ38pGWJas3kMr6yGMj1au7CaVvW16W+23XFRSuwE0s4V4ls1z5a5nUTi7Yfgi1NtJiFQq3iiSRcB1SkH/FV0UKM3Gy/grQEUywR+V0p8hO8C7QD+dFRQwg822xraCaN3oLNND5EUmA6bI9knAWZTjFMXwYfiO2W3cdWoQ3YtLlULPzNBqVAjOGgkvtnZclLyAK8iq4ygnXo+VIIOZ4EK0Ze9ibsDZHwbuX06vIoG/wbAFN9HV+WwaPE1pzfcjJ9wkhERz6OPIZlA59DRDqHSpIA45kf38VEBRTA47LT5z2ThAAbuWFWTIkBOn38=" - before_install: deploy: provider: script script: 'curl -si -H "Content-Type: application/json" --data "{\"source_type\": \"Tag\", \"source_name\": \"${TRAVIS_TAG}\"}" -X POST https://registry.hub.docker.com/u/costela/docker-etchosts/trigger/${DOCKER_HUB_TOKEN}/' diff --git a/go.mod b/go.mod index 1396c62..a5f4189 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,11 @@ require ( github.com/Microsoft/go-winio v0.4.9 // indirect github.com/cenkalti/backoff v2.1.1+incompatible github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff // indirect + github.com/docker/docker v1.13.1 // indirect github.com/docker/go-connections v0.3.0 // indirect github.com/docker/go-units v0.3.3 // indirect github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506 // indirect + github.com/google/go-cmp v0.3.1 // indirect github.com/kelseyhightower/envconfig v1.3.0 github.com/opencontainers/go-digest v1.0.0-rc1 // indirect github.com/opencontainers/image-spec v1.0.1 // indirect @@ -17,4 +19,9 @@ require ( golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 // indirect golang.org/x/net v0.0.0-20180906233101-161cd47e91fd // indirect golang.org/x/sys v0.0.0-20190130150945-aca44879d564 // indirect + gotest.tools v2.2.0+incompatible // indirect ) + +replace github.com/docker/docker v1.13.1 => github.com/docker/engine v0.0.0-20180816081446-320063a2ad06 + +go 1.13 diff --git a/go.sum b/go.sum index b238837..a690e83 100644 --- a/go.sum +++ b/go.sum @@ -10,12 +10,16 @@ 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/docker/distribution v0.0.0-20170726174610-edc3ab29cdff h1:FKH02LHYqSmeWd3GBh0KIkM8JBpw3RrShgtcWShdWJg= github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/engine v0.0.0-20180816081446-320063a2ad06 h1:CcxlLWAS/9b46iqHDTBlALJZF9atXVNjeymdCNrUfnY= +github.com/docker/engine v0.0.0-20180816081446-320063a2ad06/go.mod h1:3CPr2caMgTHxxIAZgEMd3uLYPDlRvPqCpyeRf6ncPcY= github.com/docker/go-connections v0.3.0 h1:3lOnM9cSzgGwx8VfK/NGOW5fLQ0GjIlCkaktF+n1M6o= github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506 h1:zDlw+wgyXdfkRuvFCdEDUiPLmZp2cvf/dWHazY0a5VM= github.com/gogo/protobuf v0.0.0-20170307180453-100ba4e88506/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/kelseyhightower/envconfig v1.3.0 h1:IvRS4f2VcIQy6j4ORGIf9145T/AsUB+oY8LyvN8BXNM= github.com/kelseyhightower/envconfig v1.3.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= @@ -43,3 +47,5 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564 h1:o6ENHFwwr1TZ9CUPQcfo1HGvLP1OPsPOTB7xCIOPNmU= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=