From ab844bd6344df42874c8f23fed31a42033baf6ba Mon Sep 17 00:00:00 2001 From: Fawad Halim Date: Sat, 20 Jan 2018 14:36:51 -0600 Subject: [PATCH 1/8] build --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a996edb..e104f59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,12 @@ language: go go: - 1.8.x + - 1.9.x - master -install: +before-install: - go get -v github.com/Masterminds/glide - - make get-deps \ No newline at end of file + - make get-deps + +install: + - make build \ No newline at end of file From ffedd21037fe1fbea8c23fffed8387de9055c688 Mon Sep 17 00:00:00 2001 From: Fawad Halim Date: Sat, 20 Jan 2018 14:40:32 -0600 Subject: [PATCH 2/8] Typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e104f59..2cb261d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ go: - 1.9.x - master -before-install: +before_install: - go get -v github.com/Masterminds/glide - make get-deps From 6f80a7a1f8f5e57795b4dcb84cb37c188759a1d0 Mon Sep 17 00:00:00 2001 From: Fawad Halim Date: Sat, 20 Jan 2018 16:58:21 -0600 Subject: [PATCH 3/8] Build release --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2cb261d..ef793cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,11 @@ go: before_install: - go get -v github.com/Masterminds/glide - make get-deps + - go get -v github.com/tcnksm/ghr + - go get -v https://github.com/mitchellh/gox install: - - make build \ No newline at end of file + - gox -output "dist/{{.OS}}_{{.Arch}}_{{.Dir}}" ./... + +after_success: + - ghr --username fhalim --token $GITHUB_TOKEN --replace --prerelease --debug pre-release dist/ \ No newline at end of file From e4862c25c2106bd68f370fda0bbfeb2030a383cb Mon Sep 17 00:00:00 2001 From: Fawad Halim Date: Sat, 20 Jan 2018 17:01:22 -0600 Subject: [PATCH 4/8] Ugh. Typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ef793cb..350ce3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - go get -v github.com/Masterminds/glide - make get-deps - go get -v github.com/tcnksm/ghr - - go get -v https://github.com/mitchellh/gox + - go get -v github.com/mitchellh/gox install: - gox -output "dist/{{.OS}}_{{.Arch}}_{{.Dir}}" ./... From fee0d3c4027f86b8f9c1db03972b060611b9a55e Mon Sep 17 00:00:00 2001 From: Fawad Halim Date: Sat, 20 Jan 2018 22:05:00 -0600 Subject: [PATCH 5/8] Tweaked ghr args --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 350ce3a..fa37188 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: go go: - - 1.8.x - 1.9.x - master @@ -12,7 +11,7 @@ before_install: - go get -v github.com/mitchellh/gox install: - - gox -output "dist/{{.OS}}_{{.Arch}}_{{.Dir}}" ./... + - gox -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}" ./... after_success: - - ghr --username fhalim --token $GITHUB_TOKEN --replace --prerelease --debug pre-release dist/ \ No newline at end of file + - ghr -u ${GITHUB_USERNAME} -t ${GITHUB_TOKEN} -replace -prerelease --debug pre-release dist/ \ No newline at end of file From f3fa98b0e2a3660877f2f73d6c9232f0d24f2f10 Mon Sep 17 00:00:00 2001 From: Fawad Halim Date: Sat, 20 Jan 2018 22:30:34 -0600 Subject: [PATCH 6/8] Added Dockerfile --- Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..11ac595 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM golang:1.9.2-alpine AS build +RUN apk update +RUN apk add git +RUN mkdir -p /go/src/github.com/mindis/prom2click +ADD . /go/src/github.com/mindis/prom2click +RUN go get -v github.com/Masterminds/glide +WORKDIR /go/src/github.com/mindis/prom2click +RUN apk add make +RUN make get-deps +RUN go get -v github.com/mindis/prom2click +FROM alpine:3.5 +COPY --from=build /go/bin/prom2click /usr/local/bin/prom2click +ENTRYPOINT "/usr/local/bin/prom2click" \ No newline at end of file From ebcbe02fe4bbd5070fa4e4832ed576ac9e73d63a Mon Sep 17 00:00:00 2001 From: Fawad Halim Date: Tue, 13 Mar 2018 21:21:43 -0500 Subject: [PATCH 7/8] Allow entrypoint to accept arguments --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 11ac595..6542d2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,4 @@ RUN make get-deps RUN go get -v github.com/mindis/prom2click FROM alpine:3.5 COPY --from=build /go/bin/prom2click /usr/local/bin/prom2click -ENTRYPOINT "/usr/local/bin/prom2click" \ No newline at end of file +ENTRYPOINT ["/usr/local/bin/prom2click"] \ No newline at end of file From eeeefee21446f9cf6081158eb14a81f817aea5f0 Mon Sep 17 00:00:00 2001 From: Fawad Halim Date: Tue, 13 Mar 2018 22:01:52 -0500 Subject: [PATCH 8/8] Added missing file --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6542d2c..b315238 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,5 @@ RUN make get-deps RUN go get -v github.com/mindis/prom2click FROM alpine:3.5 COPY --from=build /go/bin/prom2click /usr/local/bin/prom2click +COPY --from=build /usr/local/go/lib/time/zoneinfo.zip /usr/local/go/lib/time/zoneinfo.zip ENTRYPOINT ["/usr/local/bin/prom2click"] \ No newline at end of file