diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d541ef2f..a37d0cd90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,15 @@ All notable changes to this project will be documented in this file. ## [Unreleased][unreleased] ### Fixed +- Updated Consul API to 1.2.0 to fix breaking change (removal of deprecated Script param) ### Added ### Removed ### Changed +- Upgraded base Alpine to 3.8 and go 1.10 +- Upgraded go-dockerclient to 1.3.1 ## [v7] - 2016-03-05 ### Fixed diff --git a/Dockerfile b/Dockerfile index 416b8a725..92aa39ae7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 AS builder +FROM alpine:3.8 AS builder COPY . /go/src/github.com/gliderlabs/registrator RUN apk --no-cache add -t build-deps build-base go git curl \ && apk --no-cache add ca-certificates \ @@ -12,7 +12,7 @@ RUN apk --no-cache add -t build-deps build-base go git curl \ && rm -rf /go \ && apk del --purge build-deps -FROM alpine:3.7 +FROM alpine:3.8 COPY --from=builder /bin/registrator /bin/registrator COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/bin/registrator"] diff --git a/Gopkg.lock b/Gopkg.lock index 8c43e8960..4b13a5f50 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -3,50 +3,65 @@ [[projects]] branch = "master" + digest = "1:6da51e5ec493ad2b44cb04129e2d0a068c8fb9bd6cb5739d199573558696bb94" name = "github.com/Azure/go-ansiterm" packages = [ ".", - "winterm" + "winterm", ] + pruneopts = "UT" revision = "d6e3b3328b783f23731bc4d058875b0371ff8109" [[projects]] + digest = "1:f9ae348e1f793dcf9ed930ed47136a67343dbd6809c5c91391322267f4476892" name = "github.com/Microsoft/go-winio" packages = ["."] - revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f" - version = "v0.4.7" + pruneopts = "UT" + revision = "97e4973ce50b2ff5f09635a57e2b88a037aae829" + version = "v0.4.11" [[projects]] branch = "master" + digest = "1:3721a10686511b80c052323423f0de17a8c06d417dbdd3b392b1578432a33aae" name = "github.com/Nvveen/Gotty" packages = ["."] + pruneopts = "UT" revision = "cd527374f1e5bff4938207604a14f2e38a9cf512" [[projects]] + digest = "1:2209584c0f7c9b68c23374e659357ab546e1b70eec2761f03280f69a8fd23d77" name = "github.com/cenkalti/backoff" packages = ["."] + pruneopts = "UT" revision = "2ea60e5f094469f9e65adb9cd103795b73ae743e" version = "v2.0.0" [[projects]] branch = "master" + digest = "1:4a029051269e04c040c092eb4ddd92732f8f3a3921a8b43b82b30804e00f3357" name = "github.com/containerd/continuity" packages = ["pathdriver"] - revision = "c6cef34830231743494fe2969284df7b82cc0ad0" + pruneopts = "UT" + revision = "be9bd761db19d4fc551d40be908f02e00487511d" [[projects]] + digest = "1:b61d4e32d5101ba4056bce8ff33831ab40884ff13fabc1d2e2a3d67648e0fdcb" name = "github.com/coreos/go-etcd" packages = ["etcd"] + pruneopts = "UT" revision = "f02171fbd43c7b9b53ce8679b03235a1ef3c7b12" version = "v2.0.0" [[projects]] + digest = "1:ffe9824d294da03b391f44e1ae8281281b4afc1bdaa9588c9097785e3af10cec" name = "github.com/davecgh/go-spew" packages = ["spew"] - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" + pruneopts = "UT" + revision = "8991bc29aa16c548c550c7ff78260e27b9ab7c73" + version = "v1.1.1" [[projects]] + digest = "1:4ec8504b68b75f562efc4b291cba33194f88eaa4e68d9fc449e5b7ca68539329" name = "github.com/docker/docker" packages = [ "api/types", @@ -61,184 +76,282 @@ "api/types/swarm/runtime", "api/types/versions", "opts", - "pkg/archive", "pkg/fileutils", "pkg/homedir", "pkg/idtools", "pkg/ioutils", - "pkg/jsonmessage", "pkg/longpath", "pkg/mount", "pkg/pools", "pkg/stdcopy", "pkg/system", - "pkg/term", - "pkg/term/windows" ] - revision = "a422774e593b33bd287d9890544ad9e09b380d8c" + pruneopts = "UT" + revision = "3dfb26ab3cbf961298f8ce3f94659b5fe4146ceb" [[projects]] + digest = "1:ade935c55cd6d0367c843b109b09c9d748b1982952031414740750fdf94747eb" name = "github.com/docker/go-connections" packages = ["nat"] - revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d" - version = "v0.3.0" + pruneopts = "UT" + revision = "7395e3f8aa162843a74ed6d48e79627d9792ac55" + version = "v0.4.0" [[projects]] + digest = "1:6f82cacd0af5921e99bf3f46748705239b36489464f4529a1589bc895764fb18" name = "github.com/docker/go-units" packages = ["."] + pruneopts = "UT" revision = "47565b4f722fb6ceae66b95f853feed578a4a51c" version = "v0.3.3" [[projects]] + digest = "1:00d0d550a1f1d7ca03270ebc1e136f21f6b9dab37f0c37e9a90d56d2f7afcff9" + name = "github.com/docker/libnetwork" + packages = ["ipamutils"] + pruneopts = "UT" + revision = "0ae9b6f38f24f65567d4b46602502b33c95cf57a" + +[[projects]] + digest = "1:027133e2c23fd4ff467e66d928ab4a64f7fd7cb2f77acdb580c483f7389d22d7" name = "github.com/fsouza/go-dockerclient" - packages = ["."] - revision = "ca33ff277b527ce11b793e62f9ba244129b01caf" - version = "v1.2.0" + packages = [ + ".", + "internal/archive", + "internal/jsonmessage", + "internal/term", + ] + pruneopts = "UT" + revision = "8842d40dbf5ee062d80f9dc429db31a0fe0cdc73" + version = "v1.2.2" [[projects]] branch = "master" + digest = "1:54165f19429ccbd6d48f0ae7df3954b9485b166e6b163c028529892a5a87fabf" name = "github.com/gliderlabs/pkg" packages = ["usage"] + pruneopts = "UT" revision = "36f28d47ec7aae4d25d3d2741ac5af91f7f18680" [[projects]] + branch = "master" + digest = "1:0d6861f6e5deb4b7c17a05a03522e76c7db45f14ac15eb4d4670738cea067fc0" + name = "github.com/gliderlabs/registrator" + packages = [ + "bridge", + "consul", + "consulkv", + "etcd", + "skydns2", + "zookeeper", + ] + pruneopts = "UT" + revision = "cd981b2c59298593b94616a9fca2bb5566274ede" + +[[projects]] + digest = "1:bbadccf3d3317ea03c0dac0b45b673b4b397c8f91a1d2eff550a3c51c4ad770e" name = "github.com/gogo/protobuf" packages = ["proto"] - revision = "1adfc126b41513cc696b209667c8656ea7aac67c" - version = "v1.0.0" + pruneopts = "UT" + revision = "636bf0302bc95575d69441b25a2603156ffdddf1" + version = "v1.1.1" [[projects]] + digest = "1:d56baf8f9ef8bcf6f7c00ed2411220f5e35cc4912076de12c5a41be722eee9ec" name = "github.com/hashicorp/consul" packages = ["api"] - revision = "fb848fc48818f58690db09d14640513aa6bf3c02" - version = "v1.0.7" + pruneopts = "UT" + revision = "48d287ef690ada66634885640f3444dbf7b71d18" + version = "v1.2.3" [[projects]] - branch = "master" + digest = "1:f47d6109c2034cb16bd62b220e18afd5aa9d5a1630fe5d937ad96a4fb7cbb277" name = "github.com/hashicorp/go-cleanhttp" packages = ["."] - revision = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d" + pruneopts = "UT" + revision = "e8ab9daed8d1ddd2d3c4efba338fe2eeae2e4f18" + version = "v0.5.0" [[projects]] branch = "master" + digest = "1:45aad874d3c7d5e8610427c81870fb54970b981692930ec2a319ce4cb89d7a00" name = "github.com/hashicorp/go-rootcerts" packages = ["."] + pruneopts = "UT" revision = "6bb64b370b90e7ef1fa532be9e591a81c3493e00" [[projects]] + digest = "1:0dd7b7b01769f9df356dc99f9e4144bdbabf6c79041ea7c0892379c5737f3c44" name = "github.com/hashicorp/serf" packages = ["coordinate"] + pruneopts = "UT" revision = "d6574a5bb1226678d7010325fb6c985db20ee458" version = "v0.8.1" [[projects]] + digest = "1:0a69a1c0db3591fcefb47f115b224592c8dfa4368b7ba9fae509d5e16cdc95c8" + name = "github.com/konsorten/go-windows-terminal-sequences" + packages = ["."] + pruneopts = "UT" + revision = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242" + version = "v1.0.1" + +[[projects]] + digest = "1:fc5013a7a6f9600051ad48b059fef4a3035e8692d1c54ffd8dccfaa8ebe0b505" name = "github.com/miekg/dns" packages = ["."] - revision = "83c435cc65d2862736428b9b4d07d0ab10ad3e4d" - version = "v1.0.5" + pruneopts = "UT" + revision = "ba6747e8a94115e9dc7738afb87850687611df1b" + version = "v1.0.12" [[projects]] - branch = "master" + digest = "1:78bbb1ba5b7c3f2ed0ea1eab57bdd3859aec7e177811563edc41198a760b06af" name = "github.com/mitchellh/go-homedir" packages = ["."] - revision = "b8bc1bf767474819792c23f32d8286a45736f1c6" + pruneopts = "UT" + revision = "ae18d6b8b3205b561c79e8e5f69bff09736185f4" + version = "v1.0.0" [[projects]] + digest = "1:53bc4cd4914cd7cd52139990d5170d6dc99067ae31c56530621b18b35fc30318" + name = "github.com/mitchellh/mapstructure" + packages = ["."] + pruneopts = "UT" + revision = "3536a929edddb9a5b34bd6861dc4a9647cb459fe" + version = "v1.1.2" + +[[projects]] + digest = "1:ee4d4af67d93cc7644157882329023ce9a7bcfce956a079069a9405521c7cc8d" name = "github.com/opencontainers/go-digest" packages = ["."] + pruneopts = "UT" revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf" version = "v1.0.0-rc1" [[projects]] + digest = "1:11db38d694c130c800d0aefb502fb02519e514dc53d9804ce51d1ad25ec27db6" name = "github.com/opencontainers/image-spec" packages = [ "specs-go", - "specs-go/v1" + "specs-go/v1", ] + pruneopts = "UT" revision = "d60099175f88c47cd379c4738d158884749ed235" version = "v1.0.1" [[projects]] + digest = "1:38ee335aedf4626620f3cf8f605661e71abdcce7b40b38921962beb3980f0a20" name = "github.com/opencontainers/runc" - packages = [ - "libcontainer/system", - "libcontainer/user" - ] + packages = ["libcontainer/user"] + pruneopts = "UT" revision = "baf6536d6259209c3edfa2b22237af82942d3dfa" version = "v0.1.1" [[projects]] + digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" name = "github.com/pkg/errors" packages = ["."] + pruneopts = "UT" revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" [[projects]] + digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" name = "github.com/pmezard/go-difflib" packages = ["difflib"] + pruneopts = "UT" revision = "792786c7400a136282c1664665ae0a8db921c6c2" version = "v1.0.0" [[projects]] branch = "master" + digest = "1:4d92d3bcd412de705100c10f0428a0b63b12f3d12455ebae46e9ea384c23b333" name = "github.com/samuel/go-zookeeper" packages = ["zk"] + pruneopts = "UT" revision = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47" [[projects]] + digest = "1:dc2d85c13ac22c22a1f3170a41a8e1b897fa05134aaf533f16df44f66a25b4a1" name = "github.com/sirupsen/logrus" packages = ["."] - revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc" - version = "v1.0.5" + pruneopts = "UT" + revision = "a67f783a3814b8729bd2dac5780b5f78f8dbd64d" + version = "v1.1.0" [[projects]] + digest = "1:18752d0b95816a1b777505a97f71c7467a8445b8ffb55631a7bf779f6ba4fa83" name = "github.com/stretchr/testify" packages = ["assert"] - revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71" - version = "v1.2.1" + pruneopts = "UT" + revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686" + version = "v1.2.2" [[projects]] branch = "master" + digest = "1:583f2f436bab7b59a7bd3e759f1375b06f460760ed1f9235604d143eaab83009" name = "golang.org/x/crypto" packages = [ "ed25519", "ed25519/internal/edwards25519", - "ssh/terminal" + "ssh/terminal", ] - revision = "e73bf333ef8920dbb52ad18d4bd38ad9d9bc76d7" + pruneopts = "UT" + revision = "e3636079e1a4c1f337f212cc5cd2aca108f6c900" [[projects]] branch = "master" + digest = "1:5a83591bcb11501a55db71952158d217ad7440826eeca278e3c5d83de973091b" name = "golang.org/x/net" packages = [ "bpf", "context", - "context/ctxhttp", "internal/iana", "internal/socket", "ipv4", - "ipv6" + "ipv6", ] - revision = "5f9ae10d9af5b1c89ae6904293b14b064d4ada23" + pruneopts = "UT" + revision = "146acd28ed5894421fb5aac80ca93bc1b1f46f87" [[projects]] branch = "master" + digest = "1:850d28ab022512e2cd3cf511a77f363c29e22689b4031f2050871f5de47ae4a0" name = "golang.org/x/sys" packages = [ "unix", - "windows" + "windows", ] - revision = "79b0c6888797020a994db17c8510466c72fe75d9" + pruneopts = "UT" + revision = "4497e2df6f9e69048a54498c7affbbec3294ad47" [[projects]] + digest = "1:77b931135abb2ac4c127e7843d1231af0977227aafa21d9bb8c79b74644dcc39" name = "gopkg.in/coreos/go-etcd.v0" packages = ["etcd"] + pruneopts = "UT" revision = "6aa2da5a7a905609c93036b9307185a04a5a84a5" version = "v0.4.6" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "cda685c394db30d7f3d3c76aa470320ba13d83a37c6c53fec0e58dd0566321f4" + input-imports = [ + "github.com/cenkalti/backoff", + "github.com/coreos/go-etcd/etcd", + "github.com/fsouza/go-dockerclient", + "github.com/gliderlabs/pkg/usage", + "github.com/gliderlabs/registrator/bridge", + "github.com/gliderlabs/registrator/consul", + "github.com/gliderlabs/registrator/consulkv", + "github.com/gliderlabs/registrator/etcd", + "github.com/gliderlabs/registrator/skydns2", + "github.com/gliderlabs/registrator/zookeeper", + "github.com/hashicorp/consul/api", + "github.com/hashicorp/go-cleanhttp", + "github.com/samuel/go-zookeeper/zk", + "github.com/stretchr/testify/assert", + "gopkg.in/coreos/go-etcd.v0/etcd", + ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index acaf02625..62b3a079e 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -6,13 +6,17 @@ name = "github.com/coreos/go-etcd" version = "2.0.0" -[[constraint]] - name = "github.com/fsouza/go-dockerclient" - version = "1.2.0" - [[override]] name = "github.com/docker/docker" - revision = "a422774e593b33bd287d9890544ad9e09b380d8c" + revision = "3dfb26ab3cbf961298f8ce3f94659b5fe4146ceb" + +[[override]] + name = "github.com/docker/libnetwork" + revision = "0ae9b6f38f24f65567d4b46602502b33c95cf57a" + +[[constraint]] + name = "github.com/fsouza/go-dockerclient" + version = "=1.2.2" [[constraint]] branch = "master" @@ -20,11 +24,11 @@ [[constraint]] name = "github.com/hashicorp/consul" - version = "1.0.7" + version = "1.2.0" [[constraint]] - branch = "master" name = "github.com/hashicorp/go-cleanhttp" + version = "0.5.0" [[constraint]] branch = "master" diff --git a/consul/consul.go b/consul/consul.go index 0348c9a06..07727c2b5 100644 --- a/consul/consul.go +++ b/consul/consul.go @@ -105,9 +105,9 @@ func (r *ConsulAdapter) buildCheck(service *bridge.Service) *consulapi.AgentServ check.Timeout = timeout } } else if cmd := service.Attrs["check_cmd"]; cmd != "" { - check.Script = fmt.Sprintf("check-cmd %s %s %s", service.Origin.ContainerID[:12], service.Origin.ExposedPort, cmd) + check.Args = strings.Split(fmt.Sprintf("check-cmd %s %s %s", service.Origin.ContainerID[:12], service.Origin.ExposedPort, cmd), " ") } else if script := service.Attrs["check_script"]; script != "" { - check.Script = r.interpolateService(script, service) + check.Args = strings.Split(r.interpolateService(script, service), " ") } else if ttl := service.Attrs["check_ttl"]; ttl != "" { check.TTL = ttl } else if tcp := service.Attrs["check_tcp"]; tcp != "" { @@ -118,7 +118,7 @@ func (r *ConsulAdapter) buildCheck(service *bridge.Service) *consulapi.AgentServ } else { return nil } - if check.Script != "" || check.HTTP != "" || check.TCP != "" { + if len(check.Args) > 0 || check.HTTP != "" || check.TCP != "" { if interval := service.Attrs["check_interval"]; interval != "" { check.Interval = interval } else {