docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove merge conflict

This commit is contained in:
Maria Bermudez 2019-04-01 12:02:31 -07:00 committed by GitHub
parent c3b0c02153
commit 06d00cc3bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engine/examples/running_ssh_service.md
View File

@ -14,11 +14,10 @@ Using a static password for root access is dangerous. Create a random password b
The following `Dockerfile` sets up an SSHd service in a container that you
can use to connect to and inspect other container's volumes, or to get
quick access to a test container.
quick access to a test container. Make the following substitutions:
__Note: Replace "THEPASSWORDYOUCREATED" with the password that you created in the previous step.__
> **Note**: Use `without-password` instead of `prohibit-password` for Ubuntu 14.04.
- With `RUN echo 'root:THEPASSWORDYOUCREATED' | chpasswd`, replace "THEPASSWORDYOUCREATED" with the password you've previously generated.
- With `RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config`, use `without-password` instead of `prohibit-password` for Ubuntu 14.04.
```Dockerfile
FROM ubuntu:16.04
@ -38,16 +37,6 @@ EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
```
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
NOTE: use `without-password` instead of `prohibit-password` for Ubuntu 14.04.
>>>>>>> 9de3c4e47c... Update running_ssh_service.md
=======
>>>>>>> 2ebcae3230... Update running_ssh_service.md
=======
>>>>>>> b2ec3a6611dbb418d70c5b4082b9e118bfac3c7b
Build the image using: