Merge branch 'release/v2.0.6'

mettke · Jun 20, 2019 · 559a2f2 · 559a2f2
2 parents aae61df + 13a6655
commit 559a2f2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
 

diff --git 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)?> (v2.0.5)</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>