From 5ff7d9a7db6eee6b3c9e907c9691e7a71afb57cf Mon Sep 17 00:00:00 2001
From: Marc Mettke <marc@itmettke.de>
Date: Thu, 20 Jun 2019 18:21:37 +0200
Subject: [PATCH 1/2] Updating entrypoint to check for correct timeout util

---
 docker/entrypoint.sh                    | 6 +++---
 examples/nginx-local/docker-compose.yml | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index a445e99..9dac357 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -15,9 +15,9 @@ if [ `whoami` == 'keys-sync' ]; then
       echo "Permissions must be $(id -u keys-sync):$(id -g keys-sync) with at least 400"
       exit 1
   fi
-  if ! grep "^timeout_util = BusyBox$" /ska/config/config.ini > /dev/null; then
-      echo "timeout_util must be set to BusyBox."
-      echo "Change it to: timeout_util = BusyBox"
+  if ! grep "^timeout_util = GNU coreutils$" /ska/config/config.ini > /dev/null; then
+      echo "timeout_util must be set to GNU coreutils."
+      echo "Change it to: timeout_util = GNU coreutils"
       exit 1
   fi
 elif [ $(id -u) = 0 ]; then
diff --git a/examples/nginx-local/docker-compose.yml b/examples/nginx-local/docker-compose.yml
index 9778ca2..7ec243f 100644
--- a/examples/nginx-local/docker-compose.yml
+++ b/examples/nginx-local/docker-compose.yml
@@ -50,6 +50,7 @@ services:
       - ../shared/config-local/:/ska/config/:rw
       - ../shared/ssmtp.conf:/etc/ssmtp/ssmtp.conf:ro
       - ./public_html:/public_html:rw
+      - ../../:/ska:rw
     networks:
       - net
 

From 13a6655dc9baa55a2714d84a5c5b1e3e750df5c5 Mon Sep 17 00:00:00 2001
From: Marc Mettke <marc@itmettke.de>
Date: Thu, 20 Jun 2019 18:23:02 +0200
Subject: [PATCH 2/2] Release: v2.0.6

---
 docker/Dockerfile  | 2 +-
 templates/base.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ecba96d..3d4b386 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine
 LABEL maintainer="Marc Mettke <marc@itmettke.de>"
 
 ENV SYSTEM https://github.com/mettke/ssh-key-authority.git
-ENV TAG v2.0.4
+ENV TAG v2.0.5
 ADD entrypoint.sh /entrypoint.sh
 ADD healthcheck.sh /healthcheck.sh
 ADD cron /var/spool/cron/crontabs/root
diff --git a/templates/base.php b/templates/base.php
index ef71d6e..4164240 100644
--- a/templates/base.php
+++ b/templates/base.php
@@ -50,7 +50,7 @@
 </div>
 <div id="footer">
 	<div class="container">
-		<p class="text-muted credit"><?php out($web_config['footer'], ESC_NONE)?> (dev)</p>
+		<p class="text-muted credit"><?php out($web_config['footer'], ESC_NONE)?> (v2.0.6)</p>
 		<?php if($this->get('active_user') && $this->get('active_user')->developer) { ?>
 		<?php } ?>
 	</div>