Make 'docker exec' the default and disable SSH by default

Closes GH-168.
2015-01-19 16:39:14 +01:00
parent a0a48d8fd3
commit 2640bc7b03
5 changed files with 48 additions and 76 deletions
--- a/image/00_regen_ssh_host_keys.sh
+++ b/image/00_regen_ssh_host_keys.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-if [[ ! -e /etc/ssh/ssh_host_rsa_key ]]; then
+if [[ ! -e /etc/service/sshd/down && ! -e /etc/ssh/ssh_host_rsa_key ]] || [[ "$1" == "-f" ]]; then
 	echo "No SSH host key available. Generating one..."
 	export LC_ALL=C
 	export DEBIAN_FRONTEND=noninteractive