58f4b4c19f
Utils: Add ShellQuoteArguments
...
Upstream-commit: c5bc7d515836cffee90ba5bb342272bba64d9f37
Component: engine
2013-11-06 20:39:09 +01:00
34d9e796b2
Merge pull request #2568 from mrallen1/fix/1965
...
See if a path exists before injecting Reader there
Upstream-commit: 0dd6c6645bd7148537c6e4b3b32abe1c852b992c
Component: engine
2013-11-06 10:57:06 -08:00
d677b4b873
Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change
...
change ID to CONTAINER ID/IMAGE ID
Upstream-commit: 45aba3dc959d867147fedc8e8ac578d2acfb4d79
Component: engine
2013-11-06 09:45:23 -08:00
2e67093fd5
Merge pull request #1577 from mrallen1/fix/1502
...
Prevent DNS server conflicts in CreateBridgeIface
Upstream-commit: c22ff0296e743443b3d79b0bd5f8b9bd97a77e13
Component: engine
2013-11-06 07:52:50 -08:00
73c7a730fc
See if a path exists before injecting Reader there
...
Closes #1965
Upstream-commit: 74f853a2aeaf86ff675ecab5387bbd710a0138b7
Component: engine
2013-11-05 23:44:52 -06:00
a507d209c4
Prevent DNS server conflicts in CreateBridgeIface
...
Retrieve /etc/resolv.conf data (if available)
Add checkNameserverOverlaps and call it to
make sure there are no conflicts
Add utils.GetNameserversAsCIDR and tests
Read /etc/resolv.conf and pull out nameservers,
formatting them as a CIDR block ("1.2.3.4/32")
Upstream-commit: 3560c922b193e0f6b06c715a7b920f90a5990859
Component: engine
2013-11-05 21:24:37 -06:00
ab0ebf12a7
Merge pull request #2566 from unclejack/fix_commands_test
...
fix build for commands_test
Upstream-commit: 6113e1d62d429e7520a517ecbff331d58d51a0b7
Component: engine
2013-11-05 15:45:22 -08:00
a503078311
fix build for commands_test
...
Upstream-commit: cdf0cf495d0e0f0bbfdd8021f9cd6e68a8234dd4
Component: engine
2013-11-06 01:41:54 +02:00
bbfaa00404
Merge pull request #2562 from tchaudhri/patch-1
...
(doc) Update ubuntulinux.rst
Upstream-commit: 980eda4c25c2221127f93b7b5194e372a29be197
Component: engine
2013-11-05 14:52:07 -08:00
8a1dabb05a
Merge pull request #2423 from rogaha/volumes_doc
...
Added volumes documentation
Upstream-commit: bf05eb8ac0a8c919131c9c640e52b73387b9a1e0
Component: engine
2013-11-05 14:38:28 -08:00
e77776215c
Merge pull request #2563 from mzdaniel/desktop-integration
...
contrib: Desktop integration. Firefox usecase.
Upstream-commit: f3f9f652e1fac6039784ff11290a5cb5979ad024
Component: engine
2013-11-05 14:02:13 -08:00
63b79169a2
Merge pull request #2298 from unclejack/2070-validate_src_for_bind_mounts
...
validate source for bind mounts
Upstream-commit: 2205bb43ea1e1709b104896266edeaf58395005b
Component: engine
2013-11-05 13:31:10 -08:00
893c4c44a9
contrib: Desktop integration. Firefox usecase.
...
Upstream-commit: 5af87d147580555c72e6a1d448ab663f991cc737
Component: engine
2013-11-05 13:21:52 -08:00
497f4207e9
test: error out when bind mount source doesn't exist
...
This adds a test to verify that the server is checking whether the path
to be bind mounted actually exists on the server.
Upstream-commit: 35430e89201972d877ba01405f966882a1d3888a
Component: engine
2013-11-05 22:54:24 +02:00
9f8cb6e156
validate bind mounts on the server side
...
This changes the server side code to make sure that:
1) the source of a bind mount isn't /
The bind mount "/:/foo" isn't allowed.
2) Check that the source exists
The source to be bind mounted must exist.
This fixes issue #2070 .
Upstream-commit: 4d2ba779e1a0596c51cc6ed2ddb7c2139830f15c
Component: engine
2013-11-05 22:54:24 +02:00
730dda3e21
add test to ensure / can't be bind mounted
...
This adds a test which checks that we're erroring out when we attempt
to bind mount root in a container.
Upstream-commit: f1f39616eb052455a383de589bbc1eaa9ab5d96c
Component: engine
2013-11-05 22:54:24 +02:00
26ce0d7e39
disallow / as source for bind mount in the cli
...
This makes the docker cli reject docker run commands which include bind
mounts like "/:/some/path/in/the/container".
Bind mounting the root directory is a bad idea and the cli should throw
an error right away.
The same check will also be made by the remote API via another commit.
Upstream-commit: 4b8c41c4a2591797f97ad079e4314b21498ba732
Component: engine
2013-11-05 22:52:54 +02:00
7eaaa6080e
(doc) Update ubuntulinux.rst
...
small grammar changes - hopefully not worse than original :)
Upstream-commit: 4d5ecdbeb4e428d92c5a0089378f7bae9b3ca3d9
Component: engine
2013-11-05 12:08:56 -07:00
a193590012
Merge pull request #2554 from dotcloud/copy-config-on-build
...
Use parent image config in buildfile
Upstream-commit: 114e01cdc1457a2a6ceb2288f3d72cbd3614dc8f
Component: engine
2013-11-05 10:54:49 -08:00
9fe5aeedd4
Merge pull request #2517 from gurjeet/patch-2
...
Add gurjeet as an author
Upstream-commit: 7f7926525ac1aa1bd470121dbba22588f95e789e
Component: engine
2013-11-05 10:52:54 -08:00
d216ad8055
Merge pull request #2559 from pattichen/master
...
Fix typo
Upstream-commit: 714acf5ade98c4a3ec4069390b8cd66107347ab9
Component: engine
2013-11-05 10:30:15 -08:00
b64b038b00
Merge pull request #2460 from SvenDowideit/2294-use-repo-colon-tag-everywhere
...
covert docker (commit|import|tag) to use REPOSITORY[:TAG]
Upstream-commit: 962a66cd36a615bb0a7cb9866becdccf4aa97839
Component: engine
2013-11-05 10:29:54 -08:00
adf42b39d6
Merge pull request #2558 from tianon/go-bump
...
Bump Dockerfile to go1.2rc3
Upstream-commit: dcaaecc8152febdbb339e5f2f289db6a8e133a54
Component: engine
2013-11-04 23:39:10 -08:00
b09631ee21
Fix typo
...
Upstream-commit: 2cac81393715e6a748b3a2316d5163604497b26c
Component: engine
2013-11-04 22:36:57 -08:00
8d563825a1
Bump Dockerfile to go1.2rc3
...
Upstream-commit: fcc0ac61093d0cd0b49b11bb5f7f7501e070bd63
Component: engine
2013-11-04 21:12:18 -07:00
956deb4fe0
Merge pull request #2502 from hamo/unlink_err_v4
...
rewrite protocol check with switch-case in Server.Daemon
Upstream-commit: c5d4459a02ee98f629e65402551a871c451fb6ac
Component: engine
2013-11-04 17:46:46 -08:00
22e1fc60ec
Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
...
Update docker search to reflect future changes of the api
Upstream-commit: a482bfd715c6c33603ee5fbdc27693c942dbef93
Component: engine
2013-11-04 16:14:14 -08:00
4349b8fd0b
Merge pull request #2365 from tianon/sysvinit-consistency
...
Update sysvinit script to fix a few inconsistencies and be more useful/correct downstream
Upstream-commit: 8ad46ef401fd0665efe16f50021a5a48a14b51e5
Component: engine
2013-11-04 15:34:51 -08:00
4dd237b1bf
remove column size hack
...
Upstream-commit: 854cc5f55992b8bb200f470b11896a0b3cb68d4e
Component: engine
2013-11-04 15:34:51 -08:00
6a08c29b8a
Merge pull request #2499 from dotcloud/2414-logs_tty-fix
...
Fix logs with tty
Upstream-commit: 57cd17f6568205d8dadf38b94768a68582c9af11
Component: engine
2013-11-04 14:22:08 -08:00
33ea8b01c4
Use parent image config in buildfile
...
Upstream-commit: 99141ea3ca3c0429ecdfc3bdb097a68957beab71
Component: engine
2013-11-04 13:20:14 -08:00
b6ee1ce3fa
- Removed some unconfirmed info
...
- Added reference to the index.rst
Upstream-commit: 3061e9f37434fa6bb0714861119ae01d8c4b35fb
Component: engine
2013-11-04 13:16:51 -08:00
801c058dee
Merge pull request #2534 from jamtur01/examples_fixes
...
A variety of syntax and style fixes for the Docker examples
Upstream-commit: 19ad299600ff9acddc7baf1a97deab231c669f50
Component: engine
2013-11-04 12:35:57 -08:00
d5f3dc4566
add CmdLogs test
...
Upstream-commit: 177a2f5946623a4d4f90f5a227e57211eed6ade3
Component: engine
2013-11-04 12:23:35 -08:00
39f858c891
Fix logs with tty
...
Upstream-commit: 1f44fd8624d1de3f7e1e55880352faef2e141fb1
Component: engine
2013-11-04 12:19:20 -08:00
0d76c57f44
Merge pull request #2549 from dotcloud/ensure-container-name
...
Ensure container name on register
Upstream-commit: c065e564fb6dd6799a37ae1deb1f4e68498d04f5
Component: engine
2013-11-04 12:12:42 -08:00
83558bb275
Merge pull request #2525 from dotcloud/fix_hostnames
...
Fix regression in /etc/hosts
Upstream-commit: 342bd43b766e828753ffec35a6ae9b76e988c483
Component: engine
2013-11-04 11:26:27 -08:00
69a483e207
Merge pull request #2551 from dotcloud/concurrent-db-access
...
Add lock around write operations in graph
Upstream-commit: b380866f443141ee4b6973de22d72378b235194f
Component: engine
2013-11-04 11:24:59 -08:00
00be4ae87e
Merge pull request #2533 from jamtur01/add_sudo
...
Some format and syntax changes.
Upstream-commit: dc333878d2337684466f0241d19bccf3a4fad4b5
Component: engine
2013-11-04 11:24:51 -08:00
176a3c9fd3
Merge pull request #2501 from dotcloud/2480-check_port-fix
...
check port is valid
Upstream-commit: 261c2e23d3fb158ca94c65e11ae3f249e17c6a31
Component: engine
2013-11-04 11:23:55 -08:00
a3ae366b74
Add lock around write operations in graph
...
The graph uses a persistent database connection so
a lock is required because our current sqlite3 driver
does not implement retry logic when the ErrBusy is received.
Upstream-commit: 957db15ef4cef2f3a6b2933260a7806d69ff68e0
Component: engine
2013-11-04 10:28:38 -08:00
626d3f3226
Ensure container name on register
...
Upstream-commit: a9ed238bb76774c142107b3f06e8c9e9a1e59e65
Component: engine
2013-11-04 09:28:40 -08:00
748d21d2a0
Merge pull request #2409 from pnasrat/2089-fix-restart-runtime-error
...
Fix restart runtime error with ghost container networking
Upstream-commit: 35690e76b4989eceb0355cdf2f3bf9727a684a41
Component: engine
2013-11-04 08:55:11 -08:00
062afa9bce
Merge pull request #2427 from thequux/send-headers-immediately
...
Make /events API send headers immediately
Upstream-commit: 2a0efb23243f2e72e61efa51ceaafa58353cf21b
Component: engine
2013-11-04 08:49:27 -08:00
f35682d510
Merge pull request #2542 from oguzbilgic/changelog-0.6.5
...
Remove duplicate titles in changelog entries of v0.6.5
Upstream-commit: a4ccbc6e9517ba8a39404b8099bbbbac4b577de3
Component: engine
2013-11-04 08:25:22 -08:00
a1c937f72b
Merge pull request #2537 from jamtur01/more_names
...
Added some more colors and animals to increase the pool
Upstream-commit: 2824b0523563e5696f6b3d5016b21b26e00f76b6
Component: engine
2013-11-04 08:23:23 -08:00
3d9c1869fe
Remove duplicate titles in changelog entries of v0.6.5
...
Upstream-commit: fbfb7595b141402ecb3efb2a2c9db2a2168bfbe5
Component: engine
2013-11-04 08:20:05 -05:00
d38ad81595
tiny table heading tweak for #2149 - change ID to CONTAINER ID/IMAGE ID or IMAGE (the later if it could be an ID or a repo:tag
...
Upstream-commit: b840b73b08a4f491d0eb8b5a05302342b8bc9242
Component: engine
2013-11-04 22:10:51 +10:00
8c3f937eb2
conert docker (commit|import|tag) to use REPOSITORY[:TAG] (and repove support for REPOSITORY TAG)
...
Upstream-commit: 1f3cdc11ee0c7088c8619f8b31bcd17ce8b79b79
Component: engine
2013-11-04 22:07:55 +10:00
164d9c3b6b
Create new network on dead ghosts on restart.
...
Fixes #2089
Upstream-commit: 95708dd35cd94a2c849e37efa05bb4e01ed36bb8
Component: engine
2013-11-03 14:13:18 -05:00
