295882518c
Update docker_remote_api.rst to reflect that the latest remote API version is 1.8
...
Upstream-commit: c4444ce48fac417847f95a11024667d48e715a52
Component: engine
2013-12-17 11:48:21 -08:00
80983f7def
Merge pull request #3236 from dhrp/doc-master-warning
...
Added warning when browsing master. & no longer hides alternative versions
Upstream-commit: 7ba0f1f421fea08728675d9ec424b97ad51cd695
Component: engine
2013-12-17 11:17:17 -08:00
57ff515d90
Merge pull request #3249 from tianon/fix-sphinx-warning
...
Fix minor sphinx warning
Upstream-commit: 30454bb85ca30cec9e904e75f5d9c4e436d54858
Component: engine
2013-12-17 11:03:44 -08:00
9af351f520
Merge pull request #3248 from lsm5/docker-fedora-conflict
...
Docker fedora conflict
Upstream-commit: 2deb0c3365a5d0f8825c7fd2139f3a6cdcba2016
Component: engine
2013-12-17 11:01:37 -08:00
96dc4ccb26
Removed unnessary span element from version floater and
...
Replaced social footer by the one from www.docker.io
Upstream-commit: efc0610c0eec78850e0fc1e4f09bb294693a31e5
Component: engine
2013-12-17 10:39:22 -08:00
ab2b80c344
Merge pull request #3221 from jamtur01/introlink
...
Updated Introduction link
Upstream-commit: 391676b59875ef08e3f42bd4a80fde9b5c100f32
Component: engine
2013-12-17 10:36:00 -08:00
3d79d324f2
Merge pull request #3237 from tianon/hack-fix-cover-detection
...
Fix "go tool cover" detection to only add -cover and -coverprofile if we...
Upstream-commit: 5204feeaa98a58602d02e81e567dabf1f762921e
Component: engine
2013-12-17 10:09:40 -08:00
2756066cbe
Fix minor sphinx warning
...
Upstream-commit: 81d112cb7fc19e4919f9916c08d8409c74aa117a
Component: engine
2013-12-17 10:38:55 -07:00
2b1ed3c336
Fedora first letter capitalize and misc. rewording
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 25be0b1e987934ca39085894730b54f4bbcd8ad2
Component: engine
2013-12-17 11:32:40 -06:00
69694aee06
Merge pull request #3239 from tianon/old-go-not-supported
...
Purge more hack references to Go 1.1.2
Upstream-commit: c56b0452704664fdf5ad4eda2c81379d4cd8f5c5
Component: engine
2013-12-17 09:08:42 -08:00
bc4bacc415
Merge pull request #3168 from discordianfish/2464-replace-lxc-ps
...
Reimplement lxc-ps
Upstream-commit: d9a1cc7e2beb9a8956ed97328a945868db107f52
Component: engine
2013-12-17 09:06:52 -08:00
3fa358de88
docker and docker-io conflict update for epel
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 30b4a0f76a63f24f96ba588216990f0ae7cd60a2
Component: engine
2013-12-17 10:56:31 -06:00
fccc41956a
update fedora doc: docker and docker-io conflict
...
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com >
Upstream-commit: 7d95145b76decc511bc78d887ec3843bd182e58a
Component: engine
2013-12-17 10:33:52 -06:00
d083287985
Purge more hack references to Go 1.1.2 (since it requires backported archive/tar patches now, and Go 1.2 is _widely_ packaged successfully)
...
Upstream-commit: 5e9b4a23e6bde9e7d65ebc8b4bdfec4e1486df3a
Component: engine
2013-12-16 23:57:54 -07:00
55aa26742d
Fix "go tool cover" detection to only add -cover and -coverprofile if we both have cover support in Go, and if we have the cover tool downloaded
...
Upstream-commit: eddda577a4dd7f8fb4fb67fd1600c2a7c5de40c7
Component: engine
2013-12-16 22:54:06 -07:00
ffd30c0904
Added warning when browsing master. & no longer hides alternative versions.
...
Upstream-commit: 746ae155fb5a17c9f31873ad6d387b58574849ba
Component: engine
2013-12-16 18:36:35 -08:00
bac1f7d5e4
Merge pull request #3207 from alexlarsson/fix-applylayer
...
Re-enable TestApplyLayer and make it work
Upstream-commit: 124da338fd1c238c8b8e76b15db642104eac1b23
Component: engine
2013-12-16 16:55:48 -08:00
c5d17b12c9
Merge pull request #3232 from dhrp/Full-width-documentation
...
Full width documentation
Upstream-commit: 945a1f06f9666313b4e5cfd7579952f2c5074cfe
Component: engine
2013-12-16 15:56:39 -08:00
f97eeadc02
Change version to 0.7.2-dev
...
Upstream-commit: 64136071c6128fc759f1040186b06fee61d6aab6
Component: engine
2013-12-16 15:43:46 -08:00
f2efee0f5b
Bump to v0.7.2
...
Upstream-commit: e960152a1e9064d8c2ae57b9ab2a33d9b27276b9
Component: engine
2013-12-16 14:50:07 -08:00
3002a11d90
Improvement upon @SvenDowideit suggestion to make the docs use full-width
...
Moved the style comments source to into the .less file
Upstream-commit: fe956ad4495f0ed566bf20cb9cd10e0c54ccef6b
Component: engine
2013-12-16 14:37:56 -08:00
0617d7b95b
Merge pull request #3230 from crosbymichael/allow-untag
...
Allow untag operations with no container validation
Upstream-commit: 47375ddf54bdc3eedd460e0385cfe03c468edcf0
Component: engine
2013-12-16 14:34:56 -08:00
a37b4e5ec9
Merge pull request #3217 from SvenDowideit/deal-with-changing-paths-for-lxc-start
...
lxc-start-unconfined softlink can go bad
Upstream-commit: f0d6a91a1b1de6bf44df678ce16d694fe197eee0
Component: engine
2013-12-16 13:38:03 -08:00
8986c6ae1a
Allow untag operations with no container validation
...
Upstream-commit: 62213ee314d0669a278fae1e3052329f4ca35f75
Component: engine
2013-12-16 13:29:43 -08:00
f583fe51af
Merge branch 'use-complete-width-of-browser-for-docs' of github.com:SvenDowideit/docker into SvenDowideit-use-complete-width-of-browser-for-docs
...
Upstream-commit: fa48f17493d4f182294fe2228d7f5ecd53447ed5
Component: engine
2013-12-16 13:08:00 -08:00
2aaa1a7929
Merge pull request #3219 from unclejack/vagrant_fix_version_check
...
install vbox guest additions if the latest aren't already installed
Upstream-commit: 41d972baf1d8160f81744a239ac273ef1a84c77b
Component: engine
2013-12-16 12:49:32 -08:00
e18bf01fe0
Merge pull request #3099 from vieux/fix_pull_build
...
added authConfig to docker build
Upstream-commit: b3ad3307829dc4601cb996be3d6d8cfa37e71c79
Component: engine
2013-12-16 10:53:10 -08:00
6dc8caeed5
Fix and re-enable TestGetContainersTop
...
Upstream-commit: 5cfcb05486d9b45e347324d92350799ab05c65c8
Component: engine
2013-12-16 16:01:55 +01:00
692e7bb3bd
ApplyLayer: Fix TestLookupImage
...
The TestLookupImage test seems to use a layer that contains
/etc/postgres/postgres.conf, but not e.g. /etc/postgres.
To handle this we ensure that the parent directory always
exists, and if not we create it.
Upstream-commit: 78c22c24b353d77fdab3e1616d9986a8ae95a7c2
Component: engine
2013-12-16 14:35:43 +01:00
d5accda95c
Reimplement lxc-ps
...
Instead of calling lxc-ps in top endpoint, we reimplement it by
calling ps and filter for pids running in a given container.
Upstream-commit: 4faba4fae78ab216f2cfd90b1ef23706d933b731
Component: engine
2013-12-16 13:30:35 +01:00
638d177a3b
please, don't use 30% of the screen for whitespace, and thus compress the examples so they are ~80 chars wide - the output of 'docker ps' and 'docker images' becomes needlessly unreadable
...
Upstream-commit: e1efd4cb8c6a5c645285b1f39d4508419e5626c9
Component: engine
2013-12-16 13:24:35 +10:00
fa0d9a6f45
Merge pull request #3222 from gurjeet/zfs_driver_owner
...
Update readme to mark ZFS driver as Alpha quality.
Upstream-commit: 606cacdca0c364b8eead4cb41e0dc04fde6af0ab
Component: engine
2013-12-15 07:09:00 -08:00
0d59c96419
Update readme to mark ZFS driver as Alpha quality.
...
Upstream-commit: d526038503d59481965f6614c05ec6acb534b986
Component: engine
2013-12-15 09:17:16 -05:00
bc3c34fbfd
Updated Introduction link
...
Previously the introduction link pointed to www.docker.io. That
did not seem to make a lot of sense to me so instead I pointed it
at:
http://www.docker.io/learn_more/
Upstream-commit: 58daccab26bb9bcdbf4b14c20cc6dd0b257aa6b3
Component: engine
2013-12-15 03:13:41 -05:00
1613f79aed
install vbox guest additions if not latest
...
Upstream-commit: 12fb50826297c40dcfd047e8635f40c6824797ac
Component: engine
2013-12-14 16:00:52 +02:00
77b832e35d
when sharing a /var/lib/docker dir with more than one distribution, an existing lxc-start-unconfined softlink may point to a non-existant path, following that link (as Stat does) will cause the daemon to fail to start
...
Upstream-commit: 0a3eedd4c9d2bed208a85cd7aefae050a821eb6b
Component: engine
2013-12-14 15:29:08 +10:00
7d30838e63
Merge pull request #3197 from ajhager/3138-names
...
Validate container names on creation. Fixes #3138
Upstream-commit: a6928e70ace51793c15160e5f7206855abab89ff
Component: engine
2013-12-13 17:28:36 -08:00
3e3c1af9cc
add GetenvInt64 ans SetenvInt64
...
Upstream-commit: 85b9338205da0c8f1d62f277db342cf4b9feaf13
Component: engine
2013-12-13 16:29:22 -08:00
77daf141f4
move docker info to the job api
...
Upstream-commit: 51e2c1794b50295607c6eddb29edf39d40816a88
Component: engine
2013-12-13 16:15:15 -08:00
2cea948247
Merge pull request #3183 from vieux/job_commit
...
Move commit to job
Upstream-commit: 20899cdb34e6cd491e5c4c6830f1c53ddf64ad53
Component: engine
2013-12-13 16:11:58 -08:00
db82e5f1c7
Merge pull request #2897 from crosbymichael/aufs-42
...
Increase max image depth to 127
Upstream-commit: f5ab2516d8d50c2ef756fe92d7218bc3248d714a
Component: engine
2013-12-13 16:03:57 -08:00
3589bae2ee
improve GetenvJson
...
Upstream-commit: d5f5ecb658c7a6a0f04939061494c9d404d393ce
Component: engine
2013-12-13 16:02:19 -08:00
f8c4f98d81
use args
...
Upstream-commit: 4b5ceb0f24285718620465bb4073269d6fb8097b
Component: engine
2013-12-13 14:29:27 -08:00
ffe3e370f1
Merge pull request #3213 from metalivedev/1695-dockerlogs
...
Add more information about Docker logging
Upstream-commit: 906b481148d8355f3cab2271d55ecf64d2d46102
Component: engine
2013-12-13 14:29:14 -08:00
3eb9010924
move commit to job
...
Upstream-commit: 930ec9f52ceceabcb72589ac7f20e1e8bbccbed5
Component: engine
2013-12-13 14:19:56 -08:00
3c2d9ba7fe
Merge pull request #3175 from vieux/engine-job-stop
...
Move stop to job
Upstream-commit: aaa1c48d243e693b29bc52e382e3c37637c8bc3c
Component: engine
2013-12-13 14:15:58 -08:00
aed93695fe
Merge pull request #3214 from dotcloud/shykes_maintainer
...
Temporarily remove @shykes from engine/MAINTAINERS
Upstream-commit: d7123a597f408860a09825104972404c37a0e4e8
Component: engine
2013-12-13 14:03:08 -08:00
8638e1b670
Merge pull request #3208 from WarheadsSE/bridgeip
...
Add -bip flag: allow specification of dynamic bridge IP via CIDR
Upstream-commit: 9a9ecda7c8034534130a37a469a66e90c51799f8
Component: engine
2013-12-13 13:56:35 -08:00
dd90d88abc
Temporarily remve @shykes from engine/MAINTAINERS
...
Upstream-commit: 4975c1b54980517b5527278e637f3c05dd6a32db
Component: engine
2013-12-13 13:51:20 -08:00
9575d9c5e7
move resize to job
...
Upstream-commit: 73e8a39ff219833ebb28c12dc318466e3551b5bd
Component: engine
2013-12-13 13:15:39 -08:00
