From 2f0e1ad0b86039c8c79422810e75b3f36cadb262 Mon Sep 17 00:00:00 2001
From: Arnold Hendriks <arnold@webhare.nl>
Date: Mon, 9 Apr 2018 23:08:01 +0200
Subject: [PATCH 1/4] Allow 'make test' to work on macOS by publishing the SSH
 port and using that during tests, as the IP address cannot be directly
 reached on macOS docker

---
 test/runner.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/runner.sh b/test/runner.sh
index 5b71b71..5a3c98d 100755
--- a/test/runner.sh
+++ b/test/runner.sh
@@ -17,13 +17,13 @@ function cleanup()
 PWD=`pwd`
 
 echo " --> Starting insecure container"
-ID=`docker run -d -v $PWD/test:/test $NAME:$VERSION /sbin/my_init --enable-insecure-key`
+ID=`docker run -d -p 22 -v $PWD/test:/test $NAME:$VERSION /sbin/my_init --enable-insecure-key`
 sleep 1
 
-echo " --> Obtaining IP"
-IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" "$ID"`
-if [[ "$IP" = "" ]]; then
-	abort "Unable to obtain container IP"
+echo " --> Obtaining SSH port number"
+SSHPORT=`docker inspect --format='{{(index (index .NetworkSettings.Ports "22/tcp") 0).HostPort}}' "$ID"`
+if [[ "$SSHPORT" = "" ]]; then
+	abort "Unable to obtain container SSH port number"
 fi
 
 trap cleanup EXIT
@@ -38,5 +38,5 @@ echo " --> Logging into container and running tests"
 cp image/services/sshd/keys/insecure_key /tmp/insecure_key
 chmod 600 /tmp/insecure_key
 sleep 1 # Give container some more time to start up.
-ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /tmp/insecure_key root@$IP \
+ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /tmp/insecure_key -p $SSHPORT root@127.0.0.1 \
 	/bin/bash /test/test.sh

From dd9d23f1ea27088ae49a65e0b52eecd144aa7679 Mon Sep 17 00:00:00 2001
From: Rowan Wookey <admin@rwky.net>
Date: Sat, 30 Jun 2018 10:58:14 +0100
Subject: [PATCH 2/4] Fix /var/log permissions on syslog-ng startup

---
 image/services/syslog-ng/syslog-ng.init | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/image/services/syslog-ng/syslog-ng.init b/image/services/syslog-ng/syslog-ng.init
index b10056d..c71de29 100755
--- a/image/services/syslog-ng/syslog-ng.init
+++ b/image/services/syslog-ng/syslog-ng.init
@@ -14,6 +14,10 @@ else
   sed -i 's/##SYSLOG_OUTPUT_MODE_DEV_STDOUT##/file/' /etc/syslog-ng/syslog-ng.conf
 fi
 
+# If /var/log is writable by another user logrotate will fail
+/bin/chown root:root /var/log
+/bin/chmod 0755 /var/log
+
 PIDFILE="/var/run/syslog-ng.pid"
 SYSLOGNG_OPTS=""
 

From a018aba0c2892cdcadc398dd79f90b630e4201ef Mon Sep 17 00:00:00 2001
From: David Bernick <dbernick@broadinstitute.org>
Date: Mon, 16 Jul 2018 12:46:18 -0400
Subject: [PATCH 3/4] syslog fix

---
 image/Dockerfile                        | 2 +-
 image/services/syslog-ng/syslog-ng.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/image/Dockerfile b/image/Dockerfile
index f72dde3..da5b41d 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Phusion <info@phusion.nl>
 
 COPY . /bd_build
diff --git a/image/services/syslog-ng/syslog-ng.conf b/image/services/syslog-ng/syslog-ng.conf
index b92d852..303596f 100644
--- a/image/services/syslog-ng/syslog-ng.conf
+++ b/image/services/syslog-ng/syslog-ng.conf
@@ -54,7 +54,7 @@ destination d_newscrit { file("/var/log/news/news.crit"); };
 destination d_newserr { file("/var/log/news/news.err"); };
 destination d_newsnotice { file("/var/log/news/news.notice"); };
 
-# Some `catch-all' logfiles.
+# Some 'catch-all' logfiles.
 #
 destination d_debug { file("/var/log/debug"); };
 destination d_error { file("/var/log/error"); };

From 924f874d7e5dbb43685131122efbbfad5275a84e Mon Sep 17 00:00:00 2001
From: Travis Rowland <travis.rowland@gmail.com>
Date: Wed, 18 Jul 2018 08:17:29 -0700
Subject: [PATCH 4/4] Update Dockerfile

---
 image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image/Dockerfile b/image/Dockerfile
index da5b41d..f72dde3 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:16.04
 MAINTAINER Phusion <info@phusion.nl>
 
 COPY . /bd_build