diff --git a/README.md b/README.md index a92f3f7..9961856 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,12 @@ Features ---------------- Installation ---------------- -The software runs in a container, so just run `docker pull mdsol/logspout`. +The software runs in a container, so just run `docker pull porterdarby/logspout-cloudwatch`. This container is updated whenever the `gliderlabs/logspout` image is updated automatically using Docker Hub's automated build system. +---------------- +Building +---------------- +To build, run `./make.sh` in the root of the repository. ---------------- Workstation Usage / Outside EC2 diff --git a/docker/build.sh b/docker/build.sh index eb20fda..017c113 100644 --- a/docker/build.sh +++ b/docker/build.sh @@ -1,14 +1,14 @@ -#!/bin/sh -set -e -apk add --update go build-base git mercurial ca-certificates -mkdir -p /go/src/github.com/gliderlabs -cp -r /src /go/src/github.com/gliderlabs/logspout -cd /go/src/github.com/gliderlabs/logspout -export GOPATH=/go -go get -go build -ldflags "-X main.Version=$1" -o /bin/logspout -apk del go git mercurial build-base -rm -rf /go /var/cache/apk/* /root/.glide - -# backwards compatibility -ln -fs /tmp/docker.sock /var/run/docker.sock +#!/bin/sh +set -e +apk add --update go build-base git mercurial ca-certificates +mkdir -p /go/src/github.com/gliderlabs +cp -r /src /go/src/github.com/gliderlabs/logspout +cd /go/src/github.com/gliderlabs/logspout +export GOPATH=/go +go get +go build -ldflags "-X main.Version=$1" -o /bin/logspout +apk del go git mercurial build-base +rm -rf /go /var/cache/apk/* /root/.glide + +# backwards compatibility +ln -fs /tmp/docker.sock /var/run/docker.sock diff --git a/docker/modules.go b/docker/modules.go index 14ed01b..886af0d 100644 --- a/docker/modules.go +++ b/docker/modules.go @@ -1,9 +1,14 @@ package main import ( + _ "github.com/gliderlabs/logspout/adapters/raw" _ "github.com/gliderlabs/logspout/adapters/syslog" + _ "github.com/gliderlabs/logspout/adapters/multiline" _ "github.com/gliderlabs/logspout/httpstream" _ "github.com/gliderlabs/logspout/routesapi" + _ "github.com/gliderlabs/logspout/transports/tcp" + _ "github.com/gliderlabs/logspout/transports/udp" + _ "github.com/gliderlabs/logspout/transports/tls" _ "github.com/gliderlabs/logspout/healthcheck" _ "github.com/mdsol/logspout-cloudwatch" )