Skip to content

Commit f9989bc

Browse files
Groxxyux0
authored andcommitted
Move tcheck to go.mod, get rid of glide dependency (cadence-workflow#3999)
[glide.sh is down](Masterminds/glide#1077), breaking our pipelines, and glide is abandonware anyway. It's well past time to migrate off. I don't believe `tcheck` is actually used for anything, nor is it mentioned in any documentation... but it _does_ work, it'll tell you if e.g. cadence-frontend is running and could be useful for scripting. Though in that case a relevant `cadence ...` command would be as good or better anyway. It may be worth removing this entirely? It's not particularly large nor pulling in any new dependencies, but it may just be old cruft.
1 parent 0359fc8 commit f9989bc

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

Dockerfile

+2-15
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,10 @@ ARG GOPROXY
66
# Build tcheck binary
77
FROM golang:1.13.6-alpine AS tcheck
88

9-
RUN apk add --update --no-cache ca-certificates git curl
10-
11-
ENV GO111MODULE=off
12-
13-
RUN curl https://glide.sh/get | sh
14-
15-
ENV TCHECK_VERSION=v1.1.0
16-
17-
RUN go get -d github.com/uber/tcheck
18-
RUN cd /go/src/github.com/uber/tcheck && git checkout ${TCHECK_VERSION}
19-
209
WORKDIR /go/src/github.com/uber/tcheck
2110

22-
RUN glide install
23-
24-
RUN go install
25-
11+
COPY go.* ./
12+
RUN go build -mod=readonly -o /go/bin/tcheck github.com/uber/tcheck
2613

2714
# Build Cadence binaries
2815
FROM golang:1.13.6-alpine AS builder

cmd/server/tools.go

+3
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,7 @@ import (
4242
_ "github.com/mgechev/revive"
4343
// coverage reporting
4444
_ "github.com/dmetzgar/goveralls"
45+
46+
// health check for docker containers
47+
_ "github.com/uber/tcheck"
4548
)

go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ require (
5151
github.com/uber-go/tally v3.3.15+incompatible
5252
github.com/uber/ringpop-go v0.8.5
5353
github.com/uber/tchannel-go v1.16.0
54+
github.com/uber/tcheck v1.1.0
5455
github.com/urfave/cli v1.22.4
5556
github.com/valyala/fastjson v1.4.1
5657
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,8 @@ github.com/uber/ringpop-go v0.8.5/go.mod h1:zVI6eGO6L7pG14GkntHsSOfmUAWQ7B4lvmzl
403403
github.com/uber/tchannel-go v1.14.0/go.mod h1:Rrgz1eL8kMjW/nEzZos0t+Heq0O4LhnUJVA32OvWKHo=
404404
github.com/uber/tchannel-go v1.16.0 h1:B7dirDs15/vJJYDeoHpv3xaEUjuRZ38Rvt1qq9g7pSo=
405405
github.com/uber/tchannel-go v1.16.0/go.mod h1:Rrgz1eL8kMjW/nEzZos0t+Heq0O4LhnUJVA32OvWKHo=
406+
github.com/uber/tcheck v1.1.0 h1:Sf5jbtsSg03DZNe8vECLPtFCflAJVg/IYwIxyM9qL/o=
407+
github.com/uber/tcheck v1.1.0/go.mod h1:ytWRjtMoI4Rb/0aZxYeLQHhGyv3uxJk8UR39lq5RqNc=
406408
github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
407409
github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
408410
github.com/valyala/fastjson v1.4.1 h1:hrltpHpIpkaxll8QltMU8c3QZ5+qIiCL8yKqPFJI/yE=

0 commit comments

Comments
 (0)