examples: Add individual go modules, gitignore & update Dockerfile

elsesiy · PettitWesley · commit 2a28684e2382 · 2020-07-07T16:00:02.000-07:00
Signed-off-by: Jonas-Taha El Sesiy &lt;github@elsesiy.com&gt;
diff --git a/examples/out_gstdout/.gitignore b/examples/out_gstdout/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+out_gstdout.h
+out_gstdout.so
diff --git a/examples/out_gstdout/go.mod b/examples/out_gstdout/go.mod
@@ -0,0 +1,7 @@
+module github.com/fluent/fluent-bit-go/examples/gstdout
+
+go 1.14
+
+require github.com/fluent/fluent-bit-go v0.0.0-20200420155746-e125cab17963
+
+replace github.com/fluent/fluent-bit-go => ../..
diff --git a/examples/out_gstdout/go.sum b/examples/out_gstdout/go.sum
@@ -0,0 +1,5 @@
+github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
+jithub.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
diff --git a/examples/out_multiinstance/.gitignore b/examples/out_multiinstance/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+out_multiinstance.h
+out_multiinstance.so
diff --git a/examples/out_multiinstance/Dockerfile b/examples/out_multiinstance/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.12 as gobuilder
+FROM golang:1.14 as gobuilder
 
 WORKDIR /root
 
@@ -7,16 +7,14 @@ ENV GOOS=linux\
 
 COPY / /root/
 
-RUN go build \
-    -buildmode=c-shared \
-    -o /out_multiinstance.so \
-    github.com/fluent/fluent-bit-go/examples/out_multiinstance
+RUN go mod edit -replace github.com/fluent/fluent-bit-go=github.com/fluent/fluent-bit-go@master
+RUN go mod download & make all
 
-FROM fluent/fluent-bit:1.1
+FROM fluent/fluent-bit:1.4
 
-COPY --from=gobuilder /out_multiinstance.so /fluent-bit/bin/
-COPY --from=gobuilder /root/examples/out_multiinstance/fluent-bit.conf /fluent-bit/etc/
-COPY --from=gobuilder /root/examples/out_multiinstance/plugins.conf /fluent-bit/etc/
+COPY --from=gobuilder /root/out_multiinstance.so /fluent-bit/bin/
+COPY --from=gobuilder /root/fluent-bit.conf /fluent-bit/etc/
+COPY --from=gobuilder /root/plugins.conf /fluent-bit/etc/
 
 EXPOSE 2020
 
diff --git a/examples/out_multiinstance/go.mod b/examples/out_multiinstance/go.mod
@@ -0,0 +1,7 @@
+module github.com/fluent/fluent-bit-go/examples/multiinstance
+
+go 1.14
+
+require github.com/fluent/fluent-bit-go v0.0.0-20200420155746-e125cab17963
+
+replace github.com/fluent/fluent-bit-go => ../..
diff --git a/examples/out_multiinstance/go.sum b/examples/out_multiinstance/go.sum
@@ -0,0 +1,4 @@
+github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.DS_Store`
	`2`	`+out_gstdout.h`
	`3`	`+out_gstdout.so`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.DS_Store`
	`2`	`+out_multiinstance.h`
	`3`	`+out_multiinstance.so`