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

Merge pull request #516 from SvenDowideit/docs-fixups 

replace PID-0 with main container process, and tweak a little
This commit is contained in:
Jeffrey Morgan 2015-05-18 20:37:59 -07:00
parent b7be558548 933f2b5a76
commit 00b29799e3
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/rethinkdb-dev-database.md
View File

@ -36,14 +36,15 @@ for you). This means you can now reach RethinkDB via a client driver at
### (Advanced) Saving Data into RethinkDB with a local Node.js App ### (Advanced) Saving Data into RethinkDB with a local Node.js App
Now, you'll create the RethinkDB example chat application running on your local
OS X system to test drive your new containerized database.
First, if you don't have it yet, [download and install First, if you don't have it yet, [download and install
Node.js](http://nodejs.org/). Node.js](http://nodejs.org/).
> **Note**: this example needs Xcode installed. We'll replace it with something > **Note**: this example needs Xcode installed. We'll replace it with something
> with fewer dependencies soon. > with fewer dependencies soon.
Now, you'll create the RethinkDB example chat application running on your local
OS X system to test drive your new containerized database.
In your terminal, type: In your terminal, type:
$ export RDB_HOST=192.168.99.100 # replace with IP from above step $ export RDB_HOST=192.168.99.100 # replace with IP from above step

33
docs/userguide.md
View File

@ -34,8 +34,8 @@ the "New Container" link.
The container list includes all containers, even those not started by Kitematic, The container list includes all containers, even those not started by Kitematic,
giving you a quick over-view of the state of your Docker daemon. giving you a quick over-view of the state of your Docker daemon.
You can click on any container to view its logs (the output of the PID-0 process), You can click on any container to view its logs (the output of the main container
restart, stop or exec `sh` in that container. See [Working with a process), restart, stop or exec `sh` in that container. See [Working with a
container](#working-with-a-container) for more details. container](#working-with-a-container) for more details.
## Creating a new container ## Creating a new container
@ -48,26 +48,31 @@ and run the container.
## Working with a container ## Working with a container
If you select a non-running container, either stopped, or paused, you will be able to If you select a non-running container, either stopped, or paused, you will be able
"Restart" or "Stop" the container using the icons. You can also view the entire PID-0 to "Restart" or "Stop" the container using the icons. You can also view the entire
output logs, and in the Settings section you can make changes which will be used if you main container process' output logs, and in the Settings section you can make
"Restart" this container. changes which will be used if you "Restart" this container.
By selecting a running container from the left list, you can see some state information By selecting a running container from the left list, you can see some state information
for your container - either a preview of the HTML output for a container that has a web for your container - either a preview of the HTML output for a container that has a web
server, the PID-0 logs, and any container volumes that have been configured. server, the main container process' logs, and any container volumes that have been
configured.
![Redis container in Kitematic](../assets/cli-redis-container.png) ![Redis container in Kitematic](../assets/cli-redis-container.png)
The summary page will show different things depending on the image metadata. If The summary page will show different things depending on the image metadata. If
port 80 is `EXPOSED`, then Kitematic assumes its a web page, and will show a preview a known "web" port (see below) is `EXPOSED`, then Kitematic assumes its a web page,
of the site at `/`. If other ports are exposed, then it will show a list of those and will show a preview of the site at `/`. If other ports are exposed, then it
ports, and the Docker daemon IP and port they are mapped to. If there are any `VOLUMES`, will show a list of those ports, and the Docker daemon IP and port they are mapped
then these will be shown. At minimum, the summary screen will show the PID-0 log output. to. If there are any `VOLUMES`, then these will be shown. At minimum, the summary
screen will show the main container process' log output.
The currently detected "web" ports are, `80`, `8000`, `8080`, `3000`, `5000`,
`2368`, `9200`, and `8983`.
### Viewing container logs ### Viewing container logs
You can view the entire PID-0 container log output either by cicking on the "Logs" You can view the entire main container process' log output either by cicking on the "Logs"
preview image, or by clicking on the "Logs" tab. preview image, or by clicking on the "Logs" tab.
You can then scroll through the logs from the current running container. Note that You can then scroll through the logs from the current running container. Note that
@ -79,8 +84,8 @@ so will reset this log view.
The "Terminal" icon at the top of the container summary will `docker exec sh <your container>`. The "Terminal" icon at the top of the container summary will `docker exec sh <your container>`.
This will allow you to make quick changes, or to debug a problem. This will allow you to make quick changes, or to debug a problem.
> **Note**: Your execed `sh` process will not have the same environment settings > **Note**: Your exec'ed `sh` process will not have the same environment settings
> as the main PID-0 process and its children. > as the main container process and its children.
### Managing Volumes ### Managing Volumes