c3fb3fd512
Better error reporting in engine logs and unit tests
...
Upstream-commit: d3f074494a9594bc268bf4c639a7aea0934ec7c0
Component: engine
2013-11-05 23:00:20 +00:00
53c37bc88e
Engine: fix a bug when encoding a job environment to json
...
Upstream-commit: 434f06d03dc2825cb4f348a88ddc6d1aa17ea19c
Component: engine
2013-11-05 23:00:20 +00:00
c136168290
Hack: simplify the creation of test directories
...
Upstream-commit: 5a85456d481a5f88fc0efc02c41b3bff987c0ed1
Component: engine
2013-11-05 23:00:16 +00:00
5d5633048a
Engine: optional environment variable 'Logging' in 'serveapi'
...
Upstream-commit: 02ddaad5d985186eed94dea4105a57fa21ba24db
Component: engine
2013-11-05 18:39:59 +00:00
18c16d13e3
Engine: improved logging and identification of jobs
...
Upstream-commit: 4e7cb37dcc18975010df630d8c9580a3a65e0e69
Component: engine
2013-11-05 18:39:59 +00:00
be8463c1d5
Engine: don't export private testing utilities
...
Upstream-commit: ca6f0aa107117d2125a63eb5e78d74095bf08a4c
Component: engine
2013-11-05 18:39:59 +00:00
02af0b7684
Engine: fix a bug which caused handlers to be shared between multiple engine instances
...
Upstream-commit: 847411a1ee6e5ee5d051fc4729425215dc0c8561
Component: engine
2013-11-05 18:39:59 +00:00
6d10998928
httpapi: don't create a pidfile if it isn't set in the configuration
...
Upstream-commit: 7b17d555992c65c6b10da21c8aa48062a1aba0d9
Component: engine
2013-11-05 18:39:59 +00:00
26507356b3
Engine: 'start' starts the specified container
...
Upstream-commit: 958b4a8757e83c3fada757b10dd1be4ab7bff5ee
Component: engine
2013-11-05 18:39:59 +00:00
8a182f4aaf
Separate a) initialization of the http api and b) actually serving the api into 2 distinct jobs
...
Upstream-commit: 433c8e9c7da7cd3cd952c3dce3763db70fc450e5
Component: engine
2013-11-05 17:41:37 +00: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
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
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
164d9c3b6b
Create new network on dead ghosts on restart.
...
Fixes #2089
Upstream-commit: 95708dd35cd94a2c849e37efa05bb4e01ed36bb8
Component: engine
2013-11-03 14:13:18 -05:00
bdcce1a98c
Added some more colors and animals to increase the pool
...
Upstream-commit: a51fb4dd35b2324ff4f1f772202d45a944b9d5e1
Component: engine
2013-11-03 11:49:29 -06:00
af2d5e1f07
Introduce failing test case for #2089
...
Upstream-commit: 4cbb6ce13bf93df2a9e251dfa87fbce9952ab8a6
Component: engine
2013-11-03 11:14:59 -05:00
c9ed212566
A variety of syntax and style fixes for the Docker examples
...
* Made Docker a proper noun when needed.
* Fixed code syntax
* Fixed some whitespace issues
* Fixed some typos and grammar
* Tidied up some examples
Upstream-commit: 1cb4557cc8e40f509898bded6684a45070fbb2a4
Component: engine
2013-11-02 18:26:52 -07:00
beba024082
Some format and syntax changes.
...
* Added sudo as per convention to docker commands
* Break the Dockerfile block up
* Redis is a proper noun
* Minor whitespace fixes
Upstream-commit: c33d26a8da0dc2dd33918bc5e21283dd62f6d755
Component: engine
2013-11-02 17:53:44 -07:00
f2a6417e83
fix regression in /etc/hosts
...
Upstream-commit: f3685333c0fdea58c8e6adbc93c95ebbc4a9fa47
Component: engine
2013-11-01 15:46:26 -07:00
698f7cfe59
Merge pull request #2503 from dotcloud/2500-inspect-fix
...
Client: Inspect fix
Upstream-commit: fc455351977157e7e833d1a5ad3ce48dbf545501
Component: engine
2013-11-01 15:24:05 -07:00
cbce82a91e
Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
...
RemoteAPI: Do not split last column docker top
Upstream-commit: 8f27e23b4b28406e7cde47ea74d56232c935208c
Component: engine
2013-11-01 15:21:47 -07:00
ff81045ced
Merge pull request #2497 from dotcloud/jpetazzo-escape-apparmor-confinement
...
Runtime: escape apparmor confinement
Upstream-commit: d8bcd1c2315f6487fbd3b2b534fcb318ecbdce2c
Component: engine
2013-11-01 15:07:54 -07:00
603965c81e
Merge pull request #2521 from jamtur01/porttypo
...
Fixed 127.0.0.0 typo in cli.rst
Upstream-commit: f6b4a1ec9545c230df52d56da807d93f32208730
Component: engine
2013-11-01 14:08:27 -07:00
f8fdcccb61
rebase
...
Upstream-commit: 7ddd4fe66a00266507848e8ebc1ce3782532b51d
Component: engine
2013-11-01 14:01:32 -07:00
f207545b43
Fixed 127.0.0.0 typo in cli.rst
...
Upstream-commit: dcf4633e95c7f3784cb29b9c1f9510af28b882ed
Component: engine
2013-11-01 14:00:02 -07:00
8cac740175
Merge pull request #2510 from GrilloPress/patch-1
...
Update windows.rst
Upstream-commit: b30dc8c3eaa9f393f44fb8544cd40eb9458e0dbe
Component: engine
2013-11-01 13:56:23 -07:00
cfe12c9c5b
Merge pull request #2512 from dudebout/correct-basics-doc
...
Corrects the TCP section of the basics use
Upstream-commit: feef16bd88c249e8725da85a491c37d7bf2086e3
Component: engine
2013-11-01 13:55:28 -07:00
771aa307b1
use a symlink instead of a copy
...
Upstream-commit: f9901ead069671c04a2f99c83c1e4d8a13597e7b
Component: engine
2013-11-01 13:55:19 -07:00
5e4f415366
Refactor HostConfig and escape apparmor confinement
...
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
e048f744ba
Merge pull request #2479 from dudebout/port-redirection-doc
...
Port redirection doc
Upstream-commit: 33d8c736fcc0e7fcd18c60ad849caf7e30090755
Component: engine
2013-11-01 13:43:53 -07:00
5287e87035
Merge pull request #2492 from dotcloud/publish-all-flag
...
Add -P flag to publish all exposed ports
Upstream-commit: 65ba2868d7e0084f5edd2fc836d032f39ec39b9a
Component: engine
2013-11-01 10:21:02 -07:00
