Merge branch 'next' into patch-1

README.md

@@ -169,7 +169,7 @@ In `memcached.sh` (make sure this file is chmod +x):
 In `Dockerfile`:
 
     RUN mkdir /etc/service/memcached
-    ADD memcached.sh /etc/service/memcached/run
+    COPY memcached.sh /etc/service/memcached/run
     RUN chmod +x /etc/service/memcached/run
 
 Note that the shell script must run the daemon **without letting it daemonize/fork it**. Usually, daemons provide a command line flag or a config file option for that.
@@ -194,7 +194,7 @@ In `logtime.sh` (make sure this file is chmod +x):
 In `Dockerfile`:
 
     RUN mkdir -p /etc/my_init.d
-    ADD logtime.sh /etc/my_init.d/logtime.sh
+    COPY logtime.sh /etc/my_init.d/logtime.sh
 
 <a name="environment_variables"></a>
 ### Environment variables
@@ -408,6 +408,19 @@ Baseimage-docker disables the SSH server by default. Add the following to your D
     # init system will auto-generate one during boot.
     RUN /etc/my_init.d/00_regen_ssh_host_keys.sh
 
+Alternatively, to enable sshd only for a single instance of your container, create a folder with a [startup script](#running_startup_scripts).  The contents of that should be
+
+    ### In myfolder/enable_ssh.sh (make sure this file is chmod +x):
+    #!/bin/sh
+    rm -f /etc/service/sshd/down
+    ssh-keygen -P "" -t dsa -f /etc/ssh/ssh_host_dsa_key
+
+Then, you can start your container with
+
+    docker run -d -v `pwd`/myfolder:/etc/my_init.d my/dockerimage
+
+This will initialize sshd on container boot.  You can then access it with the insecure key as below, or using the methods to add a secure key.  Further, you can publish the port to your machine with -p 22:2222 allowing you to ssh to localhost:2222 instead of looking up the ip address.
+
 <a name="ssh_keys"></a>
 #### About SSH keys
 
@@ -459,7 +472,7 @@ Instructions for logging in the container is the same as in section [Using the i
 Edit your Dockerfile to install an SSH public key:
 
     ## Install an SSH of your choice.
-    ADD your_key.pub /tmp/your_key.pub
+    COPY your_key.pub /tmp/your_key.pub
     RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub
 
 Then rebuild your image. Once you have that, start a container based on that image: