From 9f1402e8417abc1e871e4b9a92cbbad6ea8efe35 Mon Sep 17 00:00:00 2001 From: terorie Date: Fri, 22 Feb 2019 05:07:27 +0100 Subject: [PATCH 1/3] New Dockerfile and Travis Config (#23) --- .travis.yml | 16 ++++++++++++---- Dockerfile | 10 ++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 Dockerfile diff --git a/.travis.yml b/.travis.yml index 4a35c1a..02e964f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,13 @@ -language: go +sudo: required -go: - - "1.11.x" - - master +services: + - docker + +script: + - docker build -t terorie/od-database-crawler . + +after_success: + - if [[ "$TRAVIS_BRANCH" == "stable" ]]; then + docker login -u terorie -p $DOCKER_PASSWORD ; + docker push terorie/od-database-crawler ; + fi diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..507b440 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM golang:1.11.5 AS builder +ADD . /src +RUN cd /src \ + && go test . \ + && go build -o binary + +FROM alpine +WORKDIR /app +COPY --from=builder /src/binary /app/ +ENTRYPOINT ./binary From e4d04e6a5f9f0042673e89c5771d8d0fe755cebe Mon Sep 17 00:00:00 2001 From: Richard Patel Date: Fri, 22 Feb 2019 05:10:37 +0100 Subject: [PATCH 2/3] go.mod: Fix package path lol --- go.mod | 3 +-- go.sum | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/go.mod b/go.mod index aaa2fba..9eeb244 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/syndtr/od-database-crawler +module github.com/terorie/od-database-crawler require ( github.com/beeker1121/goque v2.0.1+incompatible @@ -7,7 +7,6 @@ require ( github.com/spf13/cobra v0.0.3 github.com/spf13/viper v1.3.1 github.com/syndtr/goleveldb v0.0.0-20181128100959-b001fa50d6b2 // indirect - github.com/terorie/od-database-crawler v1.1.1 github.com/valyala/fasthttp v1.1.0 golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 golang.org/x/net v0.0.0-20180911220305-26e67e76b6c3 diff --git a/go.sum b/go.sum index 498b38a..8d675d1 100644 --- a/go.sum +++ b/go.sum @@ -41,8 +41,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/syndtr/goleveldb v0.0.0-20181128100959-b001fa50d6b2 h1:GnOzE5fEFN3b2zDhJJABEofdb51uMRNb8eqIVtdducs= github.com/syndtr/goleveldb v0.0.0-20181128100959-b001fa50d6b2/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0= -github.com/terorie/od-database-crawler v1.1.1 h1:Ca+ZqbZX3rVWBR8SDRzvroyxjBtUs75MQXZ9YG0gqGo= -github.com/terorie/od-database-crawler v1.1.1/go.mod h1:vVJ7pLkudrlUNp9qu24JCzQ8N6mFsrOmX1tPXr155DQ= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= From c2acd5463f53eb726d6f54c1b1fa90e3eef34dc8 Mon Sep 17 00:00:00 2001 From: Richard Patel Date: Fri, 22 Feb 2019 05:16:25 +0100 Subject: [PATCH 3/3] Restore .travis.yml Now handling auto-build over Docker Hub directly --- .travis.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02e964f..4a35c1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,5 @@ -sudo: required +language: go -services: - - docker - -script: - - docker build -t terorie/od-database-crawler . - -after_success: - - if [[ "$TRAVIS_BRANCH" == "stable" ]]; then - docker login -u terorie -p $DOCKER_PASSWORD ; - docker push terorie/od-database-crawler ; - fi +go: + - "1.11.x" + - master