fb9771da9e
Move archive.go to sub package
...
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
2013-10-31 16:57:45 -07:00
7ce1e20657
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
83a034fdc4
no more name encoding
...
Upstream-commit: 256b7537e332c68d0fa35b60e06726c40ed66312
Component: engine
2013-10-25 15:13:25 -07:00
3673acf131
replace == by HasPrefix for names and improve error message
...
Upstream-commit: c4923757f1f92c160a34d0a591f6e62d8d94dea3
Component: engine
2013-10-25 15:13:25 -07:00
dab2931cd1
Updated fixes post rebase from master
...
Removed test cases that are no longer
applicable with links and the port changes.
Remove test case where a test was hitting an
external ip.
Upstream-commit: 0e24db3a68cabed1ff8cf8dd10854c5de201329f
Component: engine
2013-10-25 15:13:24 -07:00
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
b3613b29c9
Fix issue killing container while sending signal
...
Fix rebase issue
Update docs
Upstream-commit: 333bc23f21e8423d3085632db99a6d1df227c5f1
Component: engine
2013-10-18 16:19:27 -07:00
02bbabf14d
Add -nostdin and -proxy to docker attach, allow arbirary signal to be sent via docker kill api endpoint
...
Allow attach from `docker start`
Add host integration script generation
Update doc with host integration
Upstream-commit: 4918769b1ac2d38f23087b766140e6a7f8979310
Component: engine
2013-10-18 16:16:29 -07:00
9ff0513e0d
change an errorf to a debugf
...
Upstream-commit: 3acfc600285dedd2e10a3780e041af0cc39675a7
Component: engine
2013-10-16 19:45:10 +00:00
609dfc2138
remove false alarm error
...
Upstream-commit: 0e64a4d7e7d5dd7c68ecc1df9fe8234938f12026
Component: engine
2013-10-16 19:38:12 +00:00
bedabb5a87
Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix
...
Abort build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 4196c704f052687e8b9010f0e407f66417c55d04
Component: engine
2013-10-15 17:40:48 -07:00
b2ba4dc1a1
Initial steps to fix Issue #936
...
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
2013-10-11 08:04:40 -05:00
f9de2ea5c3
Merge pull request #1842 from dotcloud/split_stdout_stderr
...
* Runtime: Split stdout stderr
Upstream-commit: f435970695e896ae8532cd0850700ae56d0b0516
Component: engine
2013-09-26 18:05:24 -07:00
721615e4c7
abord build if mergeConfig returns an error and fix duplicate error message
...
Upstream-commit: 5bd0437eedf8036b9648dd095b22d0772fa47e4d
Component: engine
2013-09-20 12:46:24 +00:00
ea104a3973
Merge pull request #1894 from dotcloud/1891-remove_useless_warnings
...
Don't show network related warnings when networking is disabled
Upstream-commit: 8d481193407e8aa4b91c68a525839bb3556b06d0
Component: engine
2013-09-16 13:48:17 -07:00
6deb994c66
Merge pull request #1849 from dotcloud/better_handle_hostConfig
...
Improved hostConfig reload
Upstream-commit: 45b50730e39ed5badad0a320e2163924117bdd71
Component: engine
2013-09-16 10:48:53 -07:00
613224b496
Don't show network related warnings when networking is disabled
...
Upstream-commit: 40eaa82fc617a474b1325ac22bd1299d3c0e3d48
Component: engine
2013-09-16 15:58:44 +00:00
efc88e6663
Add rm option to docker build to remove intermediate containers
...
Upstream-commit: b7a3fc687ec55b68ee0cadf78d7f1eff3e531fbd
Component: engine
2013-09-12 16:55:36 +00:00
a21e18e65f
Add documentation
...
Upstream-commit: 082d142024e69a817ed96772ee3057bbdeaa8d7d
Component: engine
2013-09-11 15:41:44 -07:00
eac5eb816d
Make StdCopy works with huge amount of data
...
Upstream-commit: e854b7b2e6666d8b47f2c9714ac3bef2320fc40b
Component: engine
2013-09-11 14:49:33 -07:00
2d267aa7ec
Fixed a bug I created when rebasing.
...
Upstream-commit: 71d46eaf029fcc49edade5e7a967909d57e5c723
Component: engine
2013-09-11 01:39:55 -07:00
da3c9e0ef2
Replaced leading spaces with tabs. Again.
...
Upstream-commit: f4ba0d42675a4085dfe96543a9265d9caf6b5e85
Component: engine
2013-09-11 01:28:20 -07:00
184c209869
Updated postContainersCreate to use writeJSON.
...
Upstream-commit: d48ea32186cfa069db80d6dd3b79a9d2e0c14c7f
Component: engine
2013-09-11 01:26:26 -07:00
29774e010f
Replaced leading spaces with tabs.
...
Upstream-commit: 33e4d73629dd2a913e5b8e4c96faba09bcb1bcac
Component: engine
2013-09-11 01:07:05 -07:00
a591fb2b8f
Rebased.
...
Upstream-commit: 07324a37eb7cc6daf32e47a85aedaa03b07586b5
Component: engine
2013-09-11 01:03:17 -07:00
6d9de425d6
Added a status code argument to writeJSON.
...
Upstream-commit: dd49cc45c885de15133a6e547671846e63a0334a
Component: engine
2013-09-11 00:23:53 -07:00
2ea799480f
improved hostConfig reload
...
Upstream-commit: f482432a76a898e5d0252b6c5878a0e60290d0a4
Component: engine
2013-09-10 22:13:15 +00:00
108dc7f51c
Merge pull request #1796 from shin-/api_1_5
...
*Remote API: Bumped API version to 1.5
*Registry: Implement login with private registry
*Remote API: Improve port mapping information
Upstream-commit: 2801624462a4b3842930d38b09a5039629d1a5d3
Component: engine
2013-09-09 16:58:54 -07:00
7453a21af1
Merge pull request #1810 from dotcloud/1798-inspect-fix
...
Detect images/containers conflicts in docker inspect
Upstream-commit: f3d51bb3d574b73c3bea7538310f3c8052ea13cb
Component: engine
2013-09-05 17:17:09 -07:00
33af815c03
remove unused getCache endpoint
...
Upstream-commit: 0d7044955a4b63c4df2a611095b87ae417a3cf9b
Component: engine
2013-09-05 23:00:52 +00:00
e904047138
Detect images/containers conflicts in docker inspect
...
Upstream-commit: 5ec2fea6dd3360de326717ed01909b8fe9c39d0f
Component: engine
2013-09-05 22:31:17 +00:00
14f3a4d119
Bumped API version in api.go ; added <1.5 behavior to getContainersJSON
...
Upstream-commit: 9ae5054c3477c6eb9afc64ad44ff41bb3f10a8ab
Component: engine
2013-09-04 23:41:44 +02:00
55601bfa49
Use base64 encoding
...
Upstream-commit: dd4aab8411ec070baeb14ecc43f683d12b722746
Component: engine
2013-09-03 20:59:48 +02:00
72419917d6
Pass auth config through headers rather than as URL param
...
Upstream-commit: d04beb7f4315c6b659958227954398437a69e5d6
Component: engine
2013-09-03 20:59:48 +02:00
d63753d770
Merge on current master
...
Upstream-commit: a2603477ddd0a7eba794dd5fd917a4d88c5241da
Component: engine
2013-09-03 20:59:48 +02:00
9762bbddd8
Move authConfig to a Parameter on postImagePush, too
...
Upstream-commit: da3bb9a7c6ad79f224ee91a2dd053c1e1b2ad053
Component: engine
2013-09-03 20:59:48 +02:00
e60a2a9f3c
Login against private registry
...
To improve the use of docker with a private registry the login
command is extended with a parameter for the server address.
While implementing i noticed that two problems hindered authentication to a
private registry:
1. the resolve of the authentication did not match during push
because the looked up key was for example localhost:8080 but
the stored one would have been https://localhost:8080
Besides The lookup needs to still work if the https->http fallback
is used
2. During pull of an image no authentication is sent, which
means all repositories are expected to be private.
These points are fixed now. The changes are implemented in
a way to be compatible to existing behavior both in the
API as also with the private registry.
Update:
- login does not require the full url any more, you can login
to the repository prefix:
example:
docker logon localhost:8080
Fixed corner corner cases:
- When login is done during pull and push the registry endpoint is used and
not the central index
- When Remote sends a 401 during pull, it is now correctly delegating to
CmdLogin
- After a Login is done pull and push are using the newly entered login data,
and not the previous ones. This one seems to be also broken in master, too.
- Auth config is now transfered in a parameter instead of the body when
/images/create is called.
Upstream-commit: fcee6056dc50de7698772a3049cdfa1eb0f2416f
Component: engine
2013-09-03 20:45:49 +02:00
6eae9b0e29
Updated "POST /containers/create" to return the right Content-Type.
...
Upstream-commit: f6b56e996d6b721cb95c1a19b1df061900fb8fd1
Component: engine
2013-08-29 09:14:14 -07:00
5443b4f352
Use additional decorator in RequestFactory to pass meta headers to registry
...
Upstream-commit: 093b85b72f7a0fcda292816716e795543b3a72eb
Component: engine
2013-08-22 21:15:31 +02:00
9fd5016532
assume ip_forwarding = 1 by default
...
Upstream-commit: b21f89862076397b63eb3ac4a19b9125b6f6477a
Component: engine
2013-08-19 12:34:30 +00:00
fdc7c648cb
API, issue 1471: Allow users belonging to the docker group to use the docker client
...
Upstream-commit: 999a8d72492c7937aa9f826406ae40158017f766
Component: engine
2013-08-12 15:16:49 -07:00
85d9c3236a
Merge pull request #1484 from titanous/use-range
...
Use ranged for loop on channels
Upstream-commit: 3e12349831903a11c67a9ca40a0d566e428aa876
Component: engine
2013-08-09 18:06:12 -07:00
66d2ddf8c5
Use ranged for loop on channels
...
Upstream-commit: 7c50221de5ec1066f0f04d6db94ee9c2fef98efb
Component: engine
2013-08-09 20:42:20 -04:00
cf78c6ec1e
Merge pull request #1146 from benoitc/feature/attach_ws
...
* Runtime: add websocket support to /container/<name>/attach/ws
Upstream-commit: 92cd2f5badd402e0f9738114004f0223a92f6016
Component: engine
2013-08-09 15:38:24 -07:00
c297029200
Merge pull request #1417 from crosbymichael/root-socket
...
Change daemon to listen on unix socket by default
Upstream-commit: 28d38620f03d3db969f7e63655728b21180b26e9
Component: engine
2013-08-08 17:06:49 -07:00
c75bcf8bab
Fix reversed IPv4Forwarding check in api.go
...
Upstream-commit: 3e491f8698860ed92b9f4cd6790eda82e083ae1e
Component: engine
2013-08-07 18:28:40 -04:00
c746f1a64f
Add warning when net.ipv4.ip_forwarding = 0
...
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
Upstream-commit: 10190be5d74bc4b13a885f2ba27c2299c868fd19
Component: engine
2013-08-07 18:28:39 -04:00
35fa368f4c
Merge branch 'feature/attach_ws' into feature/attach_ws2
...
Conflicts:
api.go
Upstream-commit: e2ca600fd8d56ed31c1e7937552173659217ab45
Component: engine
2013-08-07 23:30:28 +02:00
073f998d1d
Strip leading forward slash from resource
...
Upstream-commit: d94b1860806e11038086e91c693d86a009dcd3b0
Component: engine
2013-08-06 16:09:54 +00:00
3ea6442a29
Add cp command and copy api endpoint
...
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.
Closes #382
Upstream-commit: 5b8cfbe15c29efd3e72ea97ba87867590aeeba25
Component: engine
2013-08-06 16:09:54 +00:00
