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

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Mohit Soni 2013-08-24 00:33:01 -07:00
parent f4432d50c3 820a3b962a
commit ef82690144
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Changelog # Changelog
## 0.6.1 (2013-08-23)
* Registry: Pass "meta" headers in API calls to the registry
- Packaging: Use correct upstart script with new build tool
- Packaging: Use libffi-dev, don't build it from sources
- Packaging: Removed duplicate mercurial install command
## 0.6.0 (2013-08-22) ## 0.6.0 (2013-08-22)
- Runtime: Load authConfig only when needed and fix useless WARNING - Runtime: Load authConfig only when needed and fix useless WARNING
+ Runtime: Add lxc-conf flag to allow custom lxc options + Runtime: Add lxc-conf flag to allow custom lxc options

2
VERSION
View File

@ -1 +1 @@
0.6.0-dev 0.6.1-dev

2
docs/sources/api/docker_remote_api.rst
View File

@ -165,7 +165,7 @@ Initial version
Docker Remote API Client Libraries Docker Remote API Client Libraries
================================== ==================================
These libraries have been not tested by the Docker Maintainers for These libraries have not been tested by the Docker Maintainers for
compatibility. Please file issues with the library owners. If you compatibility. Please file issues with the library owners. If you
find more library implementations, please list them in Docker doc bugs find more library implementations, please list them in Docker doc bugs
and we will add the libraries here. and we will add the libraries here.

2
docs/sources/use/basics.rst
View File

@ -33,6 +33,8 @@ Running an interactive shell
# Run an interactive shell in the ubuntu image, # Run an interactive shell in the ubuntu image,
# allocate a tty, attach stdin and stdout # allocate a tty, attach stdin and stdout
# To detach the tty without exiting the shell,
# use the escape sequence Ctrl-p + Ctrl-q
sudo docker run -i -t ubuntu /bin/bash sudo docker run -i -t ubuntu /bin/bash
Why ``sudo``? Why ``sudo``?

4
hack/release/make.sh
View File

@ -57,7 +57,9 @@ stop on runlevel [!2345]
respawn respawn
exec docker -d script
/usr/bin/docker -d
end script
' '
# Each "bundle" is a different type of build artefact: static binary, Ubuntu # Each "bundle" is a different type of build artefact: static binary, Ubuntu