Added rsyslog support to docker container.

5 files changed, 39 insertions, 0 deletions

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4fef8887..6be1b866 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -31,6 +31,7 @@ RUN dnf -y install pinentry-gtk
 RUN dnf -y install gammaray heaptrack
 RUN dnf -y install xapian-core-devel
 RUN dnf -y install flatbuffers-devel
+RUN dnf -y install rsyslog
 
 RUN useradd -d /home/developer -m developer
 
@@ -77,9 +78,12 @@ ADD keyconfig /home/developer/keyconfig
 ADD gpg-agent.conf /home/developer/.gnupg/gpg-agent.conf
 ADD gpg.conf /home/developer/.gnupg/gpg.conf
 ADD gdbinit /home/developer/.gdbinit
+ADD enableDebug.sh /home/developer/enableDebug.sh
 RUN sudo chown developer:developer /home/developer/*
 RUN sudo chown developer:developer /home/developer/.gnupg -R
 
 RUN gpg2 --batch --generate-key /home/developer/keyconfig
 #Better qt support
 RUN git clone https://github.com/Lekensteyn/qt5printers.git ~/.gdb/qt5printers/
+
+ADD rsyslog.conf /etc/rsyslog.conf
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 00000000..869cbdc0
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,15 @@
+This is a container to build and run kube in.
+
+It contains cyrus imap which provides both an imap server as well as cal/cardDAV,
+which is required for some tests of sink.
+
+# Building
+Use the build.sh script to build the container. To rebuild from scratch add the --no-cache option to the docker command.
+
+#Using
+The container starts cyrus imap including the caldav and carddav modules.
+
+Logs for the services are available from /var/log/messages.
+
+The caldav server is available at: http://localhost/dav/calendars/users/doe
+The carddav server is available at: http://localhost/dav/addressbooks/user/doe
diff --git a/docker/bashrc b/docker/bashrc
index 68232f48..d477583c 100644
--- a/docker/bashrc
+++ b/docker/bashrc
@@ -1,6 +1,7 @@
 #Disable coredumps
 ulimit -c 0
 
+sudo rsyslogd &
 sudo saslauthd -a pam &
 sudo /usr/libexec/cyrus-imapd/master -d
 
diff --git a/docker/enableDebug.sh b/docker/enableDebug.sh
new file mode 100755
index 00000000..d9d48e7a
--- /dev/null
+++ b/docker/enableDebug.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+export QT_LOGGING_RULES="*.debug=true"
diff --git a/docker/rsyslog.conf b/docker/rsyslog.conf
new file mode 100644
index 00000000..96031558
--- /dev/null
+++ b/docker/rsyslog.conf
@@ -0,0 +1,17 @@
+# Input modules
+module(load="immark")
+
+#immuxsock support so we can log via logger
+module(load="imuxsock")
+input(type="imuxsock" Socket="/var/run/rsyslog/dev/log" CreatePath="on")
+
+#Send everything to a logfile
+*.*  /var/log/messages
+
+#Send everything to stderr
+#*.*  /proc/self/fd/2
+
+#Provide messages to stdout (doesn't seem to work?)
+module(load="omstdout")
+*.*  :omstdout:
+