From 4d66751900444136738724a094fd1a48844211a0 Mon Sep 17 00:00:00 2001 From: Porter Darby Date: Sat, 8 Jun 2019 12:04:06 -0400 Subject: [PATCH 1/4] Corrected build.sh for current version of gliderlabs/logspout custom --- docker/build.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docker/build.sh b/docker/build.sh index e69de29..86dbbee 100644 --- a/docker/build.sh +++ b/docker/build.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -ex +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 -x +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 compatability +ln -fs /tmp/docker.sock /var/run/docker.sock From 267abf9ab26df9daea71f99f0b767e226582b80b Mon Sep 17 00:00:00 2001 From: Porter Darby Date: Sat, 8 Jun 2019 12:20:06 -0400 Subject: [PATCH 2/4] Updated README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a92f3f7..e3c7b4c 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,10 @@ Installation ---------------- The software runs in a container, so just run `docker pull mdsol/logspout`. +---------------- +Building +---------------- +To build, run `./make.sh` in the root of the repository. ---------------- Workstation Usage / Outside EC2 From 44cc4aed259b4b73cb646c0b875ee1ecee29349e Mon Sep 17 00:00:00 2001 From: Porter Darby Date: Sat, 8 Jun 2019 16:22:52 -0400 Subject: [PATCH 3/4] Made all adapters and transports available. --- docker/modules.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/modules.go b/docker/modules.go index 973460c..284f6ed 100644 --- a/docker/modules.go +++ b/docker/modules.go @@ -1,8 +1,14 @@ package main import ( + _ "github.com/gliderlabs/logspout/healthcheck" + _ "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/mdsol/logspout-cloudwatch" ) From 2dbb31ca0d45bcfce46dc26a801ab51f87ee8dfa Mon Sep 17 00:00:00 2001 From: Porter Darby Date: Sat, 15 Jun 2019 21:03:00 -0400 Subject: [PATCH 4/4] Updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e3c7b4c..9961856 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ 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