Commit Graph

4910 Commits

Author SHA1 Message Date
b284ad7fc3 Merge pull request #3394 from jamtur01/clifixes
Numerous small fixes to the CLI documentation
Upstream-commit: 40aaebe56ac2de4294baacaa8aa61b20c3b2dabe
Component: engine
2013-12-30 10:56:47 -08:00
70af7e708f Numerous small fixes to the CLI documentation
Upstream-commit: a1dba16fe8562ed0545eaa3c6ed23bb1043dd102
Component: engine
2013-12-30 13:48:12 -05:00
038cb6fc8c Merge pull request #3371 from Grunny/volumes-typo-fix
Fix typo in working with volumes doc page
Upstream-commit: e31f1f1eba498c3ff4073a43533e68bf993cbbcb
Component: engine
2013-12-30 10:35:09 -08:00
09f511f43d Merge pull request #3312 from DeX77/master
Installation for FrugalWare
Upstream-commit: 7e720d0a7797698c393ef2a204c87199463ca1a8
Component: engine
2013-12-30 10:34:39 -08:00
ea65bc7c4b Merge pull request #3380 from SvenDowideit/add-no-auth-note
add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
Upstream-commit: 237868e9c3f9d1cb5f5311ef2710f83e1b3b898a
Component: engine
2013-12-30 10:00:51 -08:00
c647c27460 fixed header size on narrow desktop window
Upstream-commit: 434cf6c8ca5d20306dc27e770155ba05a931adec
Component: engine
2013-12-29 19:22:52 -08:00
5e0630fcf8 add a simple note to suggest to the user to use RUN curl/wget/tool if the URL they need is behind auth
Upstream-commit: e93b7b464733470a08a46b9937678fbfdff0abb0
Component: engine
2013-12-29 21:27:59 +10:00
a3a982cef5 Fix typo in working with volumes doc page
Upstream-commit: a17fd7b294e1334788e1812f8cc1a99e5300724b
Component: engine
2013-12-28 20:22:46 +10:00
0cd52002c8 * s/docker/Docker/
Upstream-commit: d256f3049b36ae1a1dd596535b4a82d265ff9eee
Component: engine
2013-12-27 11:55:57 +01:00
1bab794e11 Apply automatically to files named 'Dockerfile'
Upstream-commit: a1a4a99d7e80cadb97bf58963b76cd0c762888a6
Component: engine
2013-12-27 10:05:25 +01:00
93558ee08f Merge pull request #3343 from bwiklund/comment-edits
small batch of edits/corrections to comments
Upstream-commit: 808f2d39bde6884f299d72097ed28604e27c9cbb
Component: engine
2013-12-26 10:22:33 -08:00
372a1c9fdf Merge pull request #3347 from smarterclayton/patch-1
Fix typo in devmapper error message
Upstream-commit: d1ca12e81b1fc35e5ac1986439a85feaa9237a9d
Component: engine
2013-12-26 10:19:55 -08:00
1a7338c423 Document "name" query parameter for "POST /containers/create" in Remote API v1.8
Upstream-commit: 721bb410f6caa213b7d4eed9373be74287605ffc
Component: engine
2013-12-26 06:43:26 +01:00
010169891e Fix typo in devmapper error message
Upstream-commit: 029625981d3872872f0de95c5a4ea68cb1fa93af
Component: engine
2013-12-25 15:49:58 -05:00
044c307631 small batch of edits/corrections to comments
Upstream-commit: 0fccf0f68655fd01973e4c00bbb063fad1bce56c
Component: engine
2013-12-24 16:40:14 -08:00
e297baa1c0 Merge pull request #2809 from graydon/880-cache-ADD-commands-in-dockerfiles
Issue #880 - cache ADD commands in dockerfiles
Upstream-commit: efaf2cac5c8d54a5098f7036e738e1f919f84452
Component: engine
2013-12-24 16:22:51 -08:00
a35b7b892f Merge pull request #3337 from tianon/release-darwin
Release tgz and binaries for cross-compiled platforms
Upstream-commit: cb1fe939a88af2c254a5c13a4a11aafea2fd08dd
Component: engine
2013-12-24 14:44:41 -08:00
4fb94b472a Fixed #3039 - Added clarify on port options in API
Upstream-commit: d2d8a4a6c507bc8e7d591925276d79d89ce6beaf
Component: engine
2013-12-24 13:01:59 -05:00
7db2296200 Update cross and tgz to play nicely together (creating a tgz for each supported OS/ARCH), and update release.sh to upload binaries and tgz files for all the supported OS/ARCH combos
Upstream-commit: 4100e9b7df5cbce855b47b3625d34c9667e40dc1
Component: engine
2013-12-23 23:55:06 -07:00
cc04ab4930 Merge pull request #3112 from shawnl/master
hack/PACKAGERS.md: libdevmapper
Upstream-commit: 5875953d9be0bf3339185dd6b5c4b1e185eb85b6
Component: engine
2013-12-23 19:24:36 -08:00
db38486199 Merge pull request #3318 from sugi/mkimage-deb-fix-cache-glob
Fix glob expansion on mkimage-debootstrap
Upstream-commit: f4ce106e02cb917532f5686dc1fcd7fe34a15e0a
Component: engine
2013-12-23 17:20:41 -08:00
26d6511511 Merge pull request #3324 from roylee17/enhance-docker-top-err-msg
docker-top: improve error message for non-running containers
Upstream-commit: 7ec1236cee1323afaa4c5dd95130b6e81d172f26
Component: engine
2013-12-23 17:15:37 -08:00
7878ada020 Merge pull request #3327 from shykes/pkg-graphdb
Move utility package 'graphdb' to pkg/graphdb
Upstream-commit: 2b4bb67ce00a2202c01e0bfbfd34ea08e6c1a923
Component: engine
2013-12-23 16:33:11 -08:00
255f0587df Merge pull request #3331 from shykes/pkg-names
Move utility package 'namesgenerator' to pkg/namesgenerator
Upstream-commit: 6155f07561d74aac30f6935375251811ea8c4153
Component: engine
2013-12-23 16:15:26 -08:00
53605d721c Merge pull request #3330 from shykes/pkg-term
Move utility package 'term' to pkg/term
Upstream-commit: e6e35e598426d82b43200112269005cdffbbfdc0
Component: engine
2013-12-23 16:11:42 -08:00
cea3b92c30 Merge pull request #3329 from shykes/pkg-netlink
Move utility package 'netlink' to pkg/netlink
Upstream-commit: 0d207abf8ef1c5a18dddd12329f4bc0ed8f4aee6
Component: engine
2013-12-23 16:08:07 -08:00
a4e77f8375 Move utility package 'namesgenerator' to pkg/namesgenerator
Upstream-commit: a009d4ae8d67b40c0109865f4d83e6e294931ce7
Component: engine
2013-12-23 23:45:18 +00:00
5587d7db10 Merge pull request #3304 from vieux/prevent_orphan_deletion
Prevent orphan in docker rmi
Upstream-commit: b75f385abda358fe6bdb3516da4423bd72a2b253
Component: engine
2013-12-23 15:44:46 -08:00
a481c1b450 Move utility package 'term' to pkg/term
Upstream-commit: 7ce7516c12f58aa71cd055b7c0bef6585d3f2ab3
Component: engine
2013-12-23 23:42:37 +00:00
e7204ea88e Move utility package 'netlink' to pkg/netlink
Upstream-commit: f6b91262a77b2e70da8572850dd8b56d92384dfe
Component: engine
2013-12-23 23:39:39 +00:00
10227320c8 Move utility package 'graphdb' to pkg/graphdb
Upstream-commit: d16d748132330ff58e142472a579d1f6c65e3eac
Component: engine
2013-12-23 23:33:06 +00:00
8e046abf73 Merge pull request #3325 from shykes/pkg-systemd
Move utility package 'systemd' to pkg/systemd
Upstream-commit: 3fc9de3d0396d15f7310910a86100257853cdd90
Component: engine
2013-12-23 15:26:25 -08:00
3df2c5ea87 Add README to pkg
Upstream-commit: 652c2c2a80cd119ffb8017c25e741ddad9399236
Component: engine
2013-12-23 23:12:19 +00:00
60759a8d1a Move utility package 'systemd' to pkg/systemd
Upstream-commit: 8e7db0432e21adb3a753188d5321ce1165fa8964
Component: engine
2013-12-23 23:07:01 +00:00
54063489be Merge pull request #3309 from apocas/master
Wrong HTTP method in events endpoint. (documentation)
Upstream-commit: e1a15b25dc39049c9dc7ded3042422460155ed60
Component: engine
2013-12-23 14:58:49 -08:00
c952ec0ff7 docker-top: improve error message for non-running containers
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com>
Upstream-commit: b1a3a5580285b58d643ff0c09c263f78d1088f37
Component: engine
2013-12-23 14:50:24 -08:00
562f5b51cb http method typo in documentation for events endpoint (all api versions)
Upstream-commit: 614bc5c1e1e4f134f9844844ef7d8171c7f0d598
Component: engine
2013-12-23 21:21:01 +00:00
ec888af3b0 Merge pull request #3298 from creack/add_arch_user_agent
Add arch/os info to user agent (Registry)
Upstream-commit: 3fe4d5477ac3b3e9761b80f808a6f5fee6cdbdf9
Component: engine
2013-12-23 12:08:26 -08:00
b733ad7e1a Merge pull request #3302 from briandorsey/master
Added a note about a networking work-around.
Upstream-commit: cda24e345cc742f99451e43d71b3dfb49562b2d4
Component: engine
2013-12-23 11:25:20 -08:00
4c6a34d864 Merge pull request #3320 from jamtur01/privapi
API documentation update for Privileged
Upstream-commit: 88037b28779d1a8c98f3bd6d30675fb2a0a70b1e
Component: engine
2013-12-23 11:22:47 -08:00
db836da6cc Minor style cleanups to the API spec docs
Upstream-commit: ea8a3438f769c85725f34c6e51d7c73ed1fff962
Component: engine
2013-12-23 11:45:51 -05:00
93dba8079c API documentation update for Privileged
The 1.7 API docs show the ability to pass Privileged
when creating a container. This is not supported as.
Privileged is now part of hostConfig and can only be
passed when starting a container.

This fixes the documentation issue.
Upstream-commit: bf17383e35afa12f5d6cb145b26542f2dc4f95de
Component: engine
2013-12-23 09:08:28 -05:00
9526d02fc2 use the Makefile - it makes life so much simpler
Upstream-commit: 83d81758b0ca7de9ca38f4ea3a7eaaa8a0c275ad
Component: engine
2013-12-23 23:46:52 +10:00
d4d3461e31 Fix glob expansion for no-cache setting.
On previous version, glob pattern will be expanded to actual file
names when writing setting to etc/apt/apt.conf.d/no-cache.

This patch fixes to quote to work cache clean command properly.
Upstream-commit: e3b878ce983e5e01960ba5ec5c330749df7dcac4
Component: engine
2013-12-23 17:27:22 +09:00
5330cfa4e1 Merge pull request #3308 from crigor/patch-1
Change an to a
Upstream-commit: 1e5f9334e0746399856b8f1e0f7ebd28947bcee8
Component: engine
2013-12-21 15:12:50 -08:00
2bbee621e7 + added missing link in index.rst
* some gramatic and spelling fixes

Thx jamtur :)
Upstream-commit: 3edbf416bfaed2c7bacc3c5ef572efb59b4e2082
Component: engine
2013-12-22 00:00:20 +01:00
05c72ace17 Merge pull request #3272 from SvenDowideit/more-complete-run-cmd-example
A more complete example of docker run.
Upstream-commit: c2364b978de2bae79e96e53e90519ece169cf24f
Component: engine
2013-12-21 14:52:41 -08:00
b028910bf6 Installation for FrugalWare
Upstream-commit: 158e3d60ec016778b2a2615885f6a880509644f3
Component: engine
2013-12-21 23:38:13 +01:00
c6977efcc7 Wrong HTTP method in events endpoint.
Upstream-commit: e4e579b40d79764781cbb0a63d12d307ca8a71dc
Component: engine
2013-12-21 16:41:41 +00:00
f27c5dcccd Change an to a
Upstream-commit: 071528e1033623b4c2da7450b4492616101dd018
Component: engine
2013-12-21 16:23:13 +08:00