Victor Vieux
c84d74df8c
add missing ParseRepositoryTag
2013-08-14 16:59:21 +00:00
Andy Rothfusz
4cb57a5438
Merge pull request #1533 from dhrp/docs-ux-changes
...
Docs ux changes
2013-08-13 18:03:49 -07:00
Andy Rothfusz
2e5642452b
Merge pull request #1523 from dotcloud/docker-group-docs
...
Update docs for docker group
2013-08-13 18:02:30 -07:00
Michael Crosby
4947e32acb
Merged 0.5.3 hotfix release back to master
...
Conflicts:
api.go
commands.go
network.go
2013-08-13 23:47:29 +00:00
Thatcher Peskens
6c87db97a6
Resolved conflict in conf.py
...
ps. also changed navigation (swapped community and getting started)
2013-08-13 16:28:24 -07:00
Thatcher Peskens
f127c471a1
Merge remote-tracking branch 'dotcloud/master' into docs-smart-changes
...
Conflicts:
docs/sources/conf.py
2013-08-13 16:25:58 -07:00
Thatcher Peskens
f14db49346
[docs] Some user-friendly changes to the documentation.
...
- Added parmalinks (closes #1527 )
- Changed the 'fork us on github' button to 'Edit this page on github', so people can edit quickly (closes #1532 )
- Changed the favicon
2013-08-13 16:18:32 -07:00
Michael Crosby
f1cdba2937
Merge pull request #1516 from unclejack/up_hack_dockerfile_go_version_to_1.1.2
...
use Go 1.1.2 for dockerbuilder
2013-08-13 14:50:12 -07:00
Andy Rothfusz
0794f0b518
Merge pull request #1526 from metalivedev/1522-faqupdate
...
Added information about Docker's high level tools over LXC.
2013-08-13 13:57:47 -07:00
Andy Rothfusz
e2409ad337
Added information about Docker's high level tools over LXC. Formatting cleanup. Mailing list cleanup.
2013-08-13 13:45:07 -07:00
Guillaume J. Charmes
ca92bc7798
Merge pull request #1501 from KSid/vagrant-dev-dockerfile
...
Install websocket library before building docker
2013-08-13 12:16:30 -07:00
Michael Crosby
e4f35dd4cf
Update docs for docker group
2013-08-13 12:05:27 -07:00
Michael Crosby
06a092bdb5
Merge pull request #1510 from dotcloud/bump_0.5.3
...
Bump to 0.5.3
2013-08-13 10:41:57 -07:00
Michael Crosby
5d25f3232c
Update changelog to include hostname commit
2013-08-13 17:36:24 +00:00
Guillaume J. Charmes
1a1c89556f
Fix TestEnv
2013-08-13 17:34:35 +00:00
Nolan
05219d6b52
Add hostname to the container environment.
2013-08-13 17:30:21 +00:00
Guillaume J. Charmes
9cc3d7a18b
Merge pull request #1515 from dotcloud/rework_auth_push
...
* Registry: Improve auth push
2013-08-13 10:15:59 -07:00
unclejack
e09863fedb
use Go 1.1.2 for dockerbuilder
2013-08-13 19:48:30 +03:00
Victor Vieux
2ba1300773
remove checkIfLogged
2013-08-13 14:02:49 +00:00
Victor Vieux
6cb908bb82
fix merge issue
2013-08-13 13:35:34 +00:00
Michael Crosby
c3773740d9
Bump to 0.5.3
2013-08-12 23:55:42 +00:00
Steeve Morin
0ca133dd76
Handle ip route showing mask-less IP addresses
...
Sometimes `ip route` will show mask-less IPs, so net.ParseCIDR will fail. If it does we check if we can net.ParseIP, and fail only if we can't.
Fixes #1214
Fixes #362
2013-08-12 23:46:26 +00:00
Guillaume J. Charmes
68934878f1
Make sure ENV instruction within build perform a commit each time
2013-08-12 23:43:53 +00:00
Michael Crosby
ef1d1aefa7
Revert "docker.upstart: avoid spawning a sh
process"
...
This reverts commit 24dd50490a
.
2013-08-12 23:35:23 +00:00
Daniel Mizyrycki
c015d26e96
API, issue 1471: Allow users belonging to the docker group to use the docker client
2013-08-12 23:33:42 +00:00
Guillaume J. Charmes
f6760fca88
Merge pull request #1485 from dotcloud/1471-unixsocket-group
...
* Runtime: API, issue 1471: Use groups for socket permissions
2013-08-12 16:21:53 -07:00
Andy Rothfusz
90cb66f08d
Merge pull request #1508 from pborreli/typos
...
Fixed typos
2013-08-12 15:17:02 -07:00
Daniel Mizyrycki
999a8d7249
API, issue 1471: Allow users belonging to the docker group to use the docker client
2013-08-12 15:16:49 -07:00
Andy Rothfusz
13acf72a3e
Merge pull request #1504 from zaiste/docs/postgresql-service
...
docs/postgresql: PostgreSQL service on Docker example
2013-08-12 14:47:19 -07:00
Solomon Hykes
aa213b48a4
Merge pull request #1488 from KSid/336-bash-completion
...
* Contrib: bash completion script
2013-08-12 11:50:25 -07:00
Pascal Borreli
9b2a5964fc
Fixed typos
2013-08-12 18:53:06 +01:00
Guillaume J. Charmes
1110bb8e98
Merge pull request #1476 from dotcloud/improve_TestKillDifferentUser
...
* Tests: Improve TestKillDifferentUser to prevent timeout on buildbot
2013-08-12 10:23:08 -07:00
Victor Vieux
168e2f8c49
Merge pull request #1491 from titanous/gitignore-test
...
gitignore all test files
2013-08-12 09:18:31 -07:00
Michael Crosby
86ef6422f3
Merge pull request #1487 from titanous/maintainer-usernames
...
Add GitHub usernames to MAINTAINERS
2013-08-12 09:07:10 -07:00
Zaiste!
3af60bf375
fix/docs: ubuntu instead of base, note about root-only
2013-08-12 15:30:52 +02:00
Ken Cochrane
edba1af304
Merge pull request #1494 from KSid/typo-docs-run-command
...
* Documentation: Fix typo in docs for docker run -dns
2013-08-12 04:51:56 -07:00
Ken Cochrane
875e16c11b
Merge pull request #1499 from seldo/master
...
* Documentation: Adding a reference to ps -a
2013-08-12 04:51:17 -07:00
Zaiste!
d52c149075
docs/postgresql: PostgreSQL service on Docker example
2013-08-12 12:03:43 +02:00
Victor Vieux
3f95d1b9bf
Merge pull request #1497 from vincentbernat/fix/ipv4-forwarding-detection
...
runtime: correctly detect IPv4 forwarding
2013-08-12 02:07:03 -07:00
Kawsar Saiyeed
def9598ed9
Install websocket library before building docker
2013-08-12 05:22:33 +01:00
Laurie Voss
529ee848da
Adding a reference to ps -a
...
It was confusing to me as a first-time user that my docker attach command failed; I was expecting the container to run continuously, and when I couldn't attach to it, I assumed something was wrong. ps -a shows that the container still exists, which gives the user confidence to go to the next step.
2013-08-11 17:27:47 -07:00
Vincent Bernat
64b817a5c1
runtime: correctly detect IPv4 forwarding
...
When memory cgroup is absent, there was not attempt to detect if IPv4
forwarding was enabled and therefore, docker was printing a warning
for each command spawning a new container. The test for IPv4
forwarding was guarded by the test for memory cgroup.
2013-08-11 11:52:16 +02:00
Michael Crosby
940d58806c
Merge pull request #1483 from titanous/update-authors
...
Update AUTHORS
2013-08-10 21:16:34 -07:00
Kawsar Saiyeed
a2fb870ce3
Fix typo in docs for docker run -dns
2013-08-11 02:04:04 +01:00
Kawsar Saiyeed
e737856a7f
Still missed -entrypoint from 'docker run'
2013-08-11 01:29:22 +01:00
Kawsar Saiyeed
ae1909b482
Clarified bash completion limitations
2013-08-11 01:08:47 +01:00
Kawsar Saiyeed
d75282eb14
Missed -entrypoint from 'docker run' options
2013-08-11 00:57:18 +01:00
Daniel Mizyrycki
cd9886f0a8
Merge pull request #1489 from dotcloud/1422-revert-upstart
...
Revert "docker.upstart: avoid spawning a `sh` process"
2013-08-10 11:07:21 -07:00
Jonathan Rudenberg
a43bae4c0b
gitignore all test files
2013-08-10 13:48:24 -04:00
Kawsar Saiyeed
91ae135896
Add description and usage information
2013-08-10 13:05:31 +01:00