Merge pull request #81 from rchicoli/development

add unittests

Author: rchicoli

.travis.yml

@@ -21,7 +21,6 @@ before_install:
 #     - ${TRAVIS_BUILD_DIR}/vendor/gopkg.in
 
 script:
-  # - echo
   - sudo make || exit 1
   # - sudo make integration_tests || exit 1
   # - sudo make acceptance_tests || exit 1
@@ -61,7 +60,7 @@ matrix:
       if: type IN (pull_request)
 
     - stage: release
-      # env: MAJOR_RELEASE=true
+      env: MAJOR_RELEASE=true
       # it would be nice to map github labels instead
       # env: RELEASE_TAG=0.3.0
       if: type IN (push)

Dockerfile

@@ -7,17 +7,30 @@ ARG GOARM=
 WORKDIR  /go/src/github.com/rchicoli/docker-log-elasticsearch
 COPY . .
 
-RUN apk add --no-cache git
+RUN apk add --no-cache git curl
+
+# install dep
+RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+
+# RUN go get -d -v ./...
+RUN dep ensure -v
+
+# vendor/github.com/docker/docker/pkg/term/tc_linux_cgo.go:10:22:
+#  exec: "gcc": executable file not found in $PATH
+#  fatal error: termios.h: No such file or directory
+RUN apk add --no-cache dev86 gcc musl-dev
+
+# https://github.com/docker-library/golang/issues/86
+RUN go list ./...
+RUN go test -cover ./...
 
-RUN go get -d -v ./...
 RUN CGO_ENABLED=0 go build -v -a -installsuffix cgo -o /usr/bin/docker-log-elasticsearch
 
 FROM alpine:3.7
 
-# RUN apk --no-cache add ca-certificates
-RUN apk --no-cache add tzdata
 # TZ required to set the localtime
 # TZ can be set with docker plugin command
+RUN apk --no-cache add tzdata
 
 COPY --from=builder /usr/bin/docker-log-elasticsearch /usr/bin/
 WORKDIR /usr/bin

Dockerfile.local

@@ -0,0 +1,14 @@
+FROM alpine:3.7
+
+ARG GOOS=linux
+ARG GOARCH=amd64
+ARG GOARM=
+
+COPY docker-log-elasticsearch /usr/bin/
+
+# TZ required to set the localtime
+# TZ can be set with docker plugin command
+RUN apk --no-cache add tzdata
+
+WORKDIR /usr/bin
+ENTRYPOINT [ "/usr/bin/docker-log-elasticsearch" ]

Gopkg.lock

@@ -0,0 +1,66 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/Sirupsen/logrus"
+  version = "0.11.0"
+
+[[constraint]]
+  name = "github.com/docker/docker"
+  version = "17.5.0-ce-rc3"
+
+[[constraint]]
+  name = "github.com/olivere/elastic"
+  version = "6.1.4"
+
+[[constraint]]
+  name = "github.com/robfig/cron"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/vjeantet/grok"
+  version = "1.0.0"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/sync"
+
+[[constraint]]
+  name = "gopkg.in/olivere/elastic.v2"
+  version = "2.0.60"
+
+[[constraint]]
+  name = "gopkg.in/olivere/elastic.v3"
+  version = "3.0.69"
+
+[[constraint]]
+  name = "gopkg.in/olivere/elastic.v5"
+  version = "5.0.52"
+
+[prune]
+  go-tests = true
+  unused-packages = true