Merge pull request #20 from sendgridlabs/jrs_issue19

- update base alpine image from 3.2 -> 3.3
sendgridlabs · Mar 3, 2016 · 7753d27 · 7753d27
2 parents 6d2bf84 + 3d8f3a9
commit 7753d27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@
 #
 #################################################################
 
-FROM alpine:3.2
+FROM alpine:3.3
 MAINTAINER Jonathan Short <[email protected]>
 
 RUN apk add --update rsyslog rsyslog-tls && rm -rf /var/cache/apk/*

diff --git a/rsyslog.conf b/rsyslog.conf
@@ -1,6 +1,8 @@
 # Input modules
 $ModLoad immark.so     # provide --MARK-- message capability
 $ModLoad imuxsock.so   # provide local system logging (e.g. via logger command)
+$ModLoad imudp         # provides UDP syslog reception
+$ModLoad imtcp         # provides TCP syslog reception
 
 # Output modules
 $ModLoad omstdout.so       # provide messages to stdout
@@ -29,9 +31,7 @@ $ActionSendStreamDriverPermittedPeer *.loggly.com
 *.* @@logs-01.loggly.com:6514;LogglyFormat
 
 # TCP Syslog Server
-$ModLoad imtcp         # provides TCP syslog reception
 $InputTCPServerRun 514 # start a TCP syslog server at standard port 514
 
 # UDP Syslog Server
-$ModLoad imudp         # provides UDP syslog reception
 $UDPServerRun 514      # start a UDP syslog server at standard port 514