bbca49004b
Merge pull request #14557 from maaquib/14418-dangling-link-in-runmd
...
Fixing dangling link in docs/reference/commandline/run.md
Upstream-commit: 490e78a642492f25d6c0f7cf1ee855b192d323c7
Component: engine
2015-07-23 16:29:17 -07:00
bf29f91881
Merge pull request #14589 from paetling/ae-update_net_docs
...
add to docs that ports do not get exposed when using --net
Upstream-commit: ae027c08642621877a93187c0f2b0451df8b71fd
Component: engine
2015-07-23 16:22:21 -07:00
c4ddbfd5f9
Merge pull request #14545 from Djelibeybi/oraclelinux6-rpm
...
Updated docker-engine.spec to build on Oracle Linux 6.
Upstream-commit: c6f4c192fe33bd04fb2b624c115d176f17de7a06
Component: engine
2015-07-23 13:29:48 -07:00
71043d24b2
Merge pull request #14831 from duglin/VendorDist
...
Vendor latest distributions so we can use the new errcode stuff
Upstream-commit: 4af94efcf0be5b0fa0da6befd4081badf3d82ba9
Component: engine
2015-07-23 13:17:55 -07:00
3d278636eb
Merge pull request #14034 from hqhq/hq_checkconfig_xattr
...
Some check_config enhancement
Upstream-commit: f28877257bf87a967509933159b16f24846338cb
Component: engine
2015-07-23 13:01:59 -07:00
7fa69a889f
Merge pull request #14854 from rhvgoyal/unmount-base
...
docker: Unmount -init layer root before taking a snapshot
Upstream-commit: 1e40915e9d626ba8a00170941886fefab96fa682
Component: engine
2015-07-23 15:17:07 -04:00
6a78a43641
Merge pull request #14900 from duglin/AddFilterToDoc
...
Add filter to /images/json docs
Upstream-commit: 4e035031b03da375a58bac2263a5eff8ea1acf1a
Component: engine
2015-07-23 11:57:12 -07:00
7b98273c2e
Merge pull request #14887 from Microsoft/10662-stupidtypo
...
Windows: Stupid copy/paste error
Upstream-commit: 9dcd0cc1ee442ca262491b7738890793be641abc
Component: engine
2015-07-23 14:49:17 -04:00
f7a16948b8
Do Docker edits so we can use the new distribution code
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b874ef8f43754e5c0fe40b90c3533db93491753e
Component: engine
2015-07-23 10:24:46 -07:00
ba54a4bec5
Vendor latest distributions so we can use the new errcode stuff
...
ping @stevvooe @RichardScothern
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8b69552b50b0811db077b4bc2583d167e7c8aaec
Component: engine
2015-07-23 10:24:46 -07:00
a9894a24cf
Merge pull request #13933 from ypid/mkimage-no-compression
...
Do not compress rootfs archive in mkimage.sh.
Upstream-commit: 8c2836399338e72eeaaa079a893488c768da97c1
Component: engine
2015-07-23 10:22:07 -07:00
f26842120f
Merge pull request #14855 from ewindisch/apparmor-unconfined
...
Introduce a dedicated unconfined AA policy
Upstream-commit: ac9fc03c74e65a6a18bc0854d4a2841637fe1acf
Component: engine
2015-07-23 10:21:51 -07:00
1b57972b10
Merge pull request #14903 from jfrazelle/fix-experimental-rpm-debs
...
pass DOCKER_EXPERIMENTAL into build images
Upstream-commit: e5d8fb965815d3037622d74aa8f99e260f6e06a8
Component: engine
2015-07-23 10:05:00 -07:00
3c4c28eff3
Merge pull request #14901 from albers/completion-log-opt-fixes
...
Fixes to bash completion for log driver options
Upstream-commit: 2cf9fec111e86cc9cf2409f398d5092728d54325
Component: engine
2015-07-23 10:03:29 -07:00
81c6019b8c
pass DOCKER_EXPERIMENTAL into build images
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 76d6751600fe91424171b886fdd87fb3eb3a1380
Component: engine
2015-07-23 09:42:22 -07:00
238e8e4b51
Merge pull request #14891 from jgeiger/fix_typo_in_builder_docs_for_dockerignore
...
Fix typo in builder.mb .dockerignore example
Upstream-commit: 9e438ffb612c4425026131ea67be5d15a8bdfc45
Component: engine
2015-07-23 18:26:16 +02:00
70222bd2d9
Merge pull request #14893 from Evalle/14653-fix-sles-issue
...
Fixing SLES12 issue
Upstream-commit: d44e334a6eab31edf2700bf2ca2246b3cfe976a8
Component: engine
2015-07-23 18:22:38 +02:00
b53aa65918
Merge pull request #14905 from jfrazelle/fix-fedora-install
...
fix fedora release
Upstream-commit: c9937c3a80f3e50437202e17927a8336adf048e8
Component: engine
2015-07-23 09:17:48 -07:00
b8bceb1145
fix fedora release
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 8192a9ac6cc5b1e010b20185ccef6aecfed7c405
Component: engine
2015-07-23 09:16:35 -07:00
178131f8bd
Merge pull request #14898 from runcom/sockRequestRaw-close-body
...
Ensure body is closed after error is checked
Upstream-commit: c2346f6406349caabdc5cfefab9efa2bd32881fe
Component: engine
2015-07-23 10:11:44 -04:00
6fd5a9b231
Ensure body is closed after error is checked
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 18faf6f94e0995ac3fab703d22ca82baf4a65676
Component: engine
2015-07-23 14:34:38 +02:00
b1387e7404
Add filter to /images/json docs
...
Closes #14894
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: a20bf5e61c542fea377345d5318293b44c65cbb5
Component: engine
2015-07-23 05:29:09 -07:00
f7e4d6020e
Complete all known driver options if no log driver was specified
...
Without this fix, `docker --log-opt ` would not complete anything
because the completions were driver specific.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: de40f3997a7aae94e925d8f694e2161b1b1b92bb
Component: engine
2015-07-23 14:19:13 +02:00
f7f00cecc7
Fix problem with = in completion of docker global options
...
Without this fix, `docker --log-driver fluentd --log-opt fluentd-tag=b`
would complete `b` to `build`.
Completion of the commands has to be nailed to __docker_pos_first_nonflag
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6de8dd1a6e37ea6ef04d779c6348452c1a3c2370
Component: engine
2015-07-23 13:52:06 +02:00
ab56e0ae0e
Fixing SLES12 issue
...
Signed-off-by: evalle <shmarnev@gmail.com >
Upstream-commit: 94119c58a103ef59262052b11b414b8a51299da6
Component: engine
2015-07-23 08:59:23 +02:00
f367cae014
Fix typo in builder.mb .dockerignore example
...
Signed-off-by: jgeiger <jgeiger@gmail.com >
Upstream-commit: 9086c16f4283e330361ec9621781f6315fe3467f
Component: engine
2015-07-22 23:54:46 -06:00
fdfbc95b60
Merge pull request #14880 from Microsoft/10662-paniconremotetest
...
Stop SIGSEGV on test dial not reachable
Upstream-commit: d593130fdae2564434fc91de59bf5fd2f5eec05f
Component: engine
2015-07-22 23:21:12 -04:00
c3fd734293
Merge pull request #14886 from duglin/FixDepDoc
...
Fix typo in deprecation doc
Upstream-commit: c5053d4700379e6bd46b498b8559f5be88c8c1a2
Component: engine
2015-07-22 23:15:09 -04:00
a35c348dcd
Merge pull request #12850 from coolljt0725/add_ulimi_to_build
...
Add ulimit to docker build
Upstream-commit: 7e4db0a3704b3f156e6a67ce32a7fcada61fdef1
Component: engine
2015-07-22 23:11:47 -04:00
c8167142d1
Windows: Stupid copy/paste error
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cef5cb2dcbe1089f5fde6478a9c0f2ed93ce3c80
Component: engine
2015-07-22 19:30:47 -07:00
b278b668e9
Add ulimit to docker build.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 877dbbbde8aaf6583a81d9946e4c83db8e356b1a
Component: engine
2015-07-23 10:26:06 +08:00
6983345fdd
Fix typos in deprecation doc
...
thanks @tiborvass
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ea3dcee913d5c76984354340239f97a725035e88
Component: engine
2015-07-22 18:45:12 -07:00
caa155ce8e
Stop SIGSEGV on test dial not reachable
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 09b86c46b82e3d116840f3327a1f995b904ecfa4
Component: engine
2015-07-22 18:44:04 -07:00
13728496d1
Merge pull request #14884 from aaronlehmann/redundant-image-checks
...
Avoid redundant HEAD requests for identical layers on push
Upstream-commit: 48d057f8a9c7a3aefaab21cbb6eb51074f8f8df8
Component: engine
2015-07-22 18:28:39 -07:00
e87491eb72
Avoid redundant HEAD requests for identical layers on push
...
pushV2Tag already deduplicates layers, but the scope of this
deduplication is only for a particular tag. If we are pushing all tags
in a repository, we may check layers several times. Fix this by moving
the layersSeen map from the pushV2Tag function to the v2Pusher struct.
In addition to avoiding some useless round-trips, this makes the "docker
push" output less confusing. It formerly could contain many repeated
lines like:
124e2127157f: Image already exists
124e2127157f: Image already exists
...
Add test coverage based on the "docker push" output: a hash should not
appear multiple times when pushing multiple tags.
Fixes #14873
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 810d3b2642d4a82dc186d6eff8c2e487ee624bc5
Component: engine
2015-07-22 17:54:20 -07:00
c0b55ed08f
Merge pull request #14878 from icecrime/14756_golint_on_ci
...
Enable validate-lint as part of CI
Upstream-commit: 5fdc10239624aa3b623f46af28bf237b0f33299f
Component: engine
2015-07-22 16:32:29 -07:00
6f661b9f5c
Merge pull request #14580 from rohitkadam19/patch-1
...
Update docker_remote_api_v1.17.md
Upstream-commit: a3857cc3799e2a92b92f07842c03b442490f01ab
Component: engine
2015-07-22 19:22:37 -04:00
8cd4fb4243
Merge pull request #14638 from jfrazelle/new-repo-install-script
...
update install script/docs for new apt and yum repos
Upstream-commit: f21819275470b8a3ec6915fa59f386be44371356
Component: engine
2015-07-22 15:25:27 -07:00
c56f8c4097
Enable validate-lint as part of CI
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: bc8b8e03b48bf1ef6ce6b67271948e4a20c2ed31
Component: engine
2015-07-22 15:23:34 -07:00
e804755952
Merge pull request #14862 from vdemeester/validate-lint-all-files
...
Update validate-lint to lint all go files
Upstream-commit: 3198e76b7758ece76600562d960cb17ad735c7ca
Component: engine
2015-07-22 15:18:02 -07:00
54ba2b1bf3
update install script for new repos
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 451d3f5950b493029000c2554fe3f266ffb007e4
Component: engine
2015-07-22 15:08:19 -07:00
56865b2a68
update docs for new install script
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 877d740d4837c67030458254db80aea3869989b1
Component: engine
2015-07-22 15:08:14 -07:00
9ac27d43a3
Merge pull request #13900 from duglin/Deprecate
...
Define Docker's deprecation policy
Upstream-commit: a628155a7211041b9e671980ead195ddc6e63c6b
Component: engine
2015-07-22 23:23:37 +02:00
bdf2ee5403
Update validate-lint to lint all go files
...
By default, using go with package will only validate the go file for the
current platform (or at last misses file_windows.go for example). This
tries to fix that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: fa34f07ec04e22b2e0631cc0656ba569b453d21c
Component: engine
2015-07-22 23:21:18 +02:00
4b6852a08a
Merge pull request #14839 from jfrazelle/better-io-error
...
better i/o timeout error on pull
Upstream-commit: f82ebe5932c24e0062ebe3ef0ea4c1f319cdc544
Component: engine
2015-07-22 14:10:50 -07:00
4ecc8c2651
Define Docker's deprecation policy
...
Announce the cmd line options that are targetted for removal
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 27b828c9e4430e432380bae4962a366c22228823
Component: engine
2015-07-22 14:09:49 -07:00
4c0710e3a5
Merge pull request #14528 from estesp/add-readme-links
...
Add links and correct locations in project/README.md
Upstream-commit: 4160d1af7d36e8ce37e6a4acc0e0e3920577521f
Component: engine
2015-07-22 23:05:32 +02:00
76ec388f40
Merge pull request #14864 from ewindisch/apparmor-engine-policy
...
Add AppArmor policy for the docker binary
Upstream-commit: a7d84503128720612022d46f5c9c04602cb19f05
Component: engine
2015-07-22 13:56:33 -07:00
9aaecca296
Merge pull request #14872 from jfrazelle/fix-debs-apparmour
...
update deb dockerfiles
Upstream-commit: 80fec1dbaf59fd8b7ac4578910bba3b9ab9d8548
Component: engine
2015-07-22 13:35:24 -07:00
8a3dfa5be3
Add links and correct locations in project/README.md
...
After removing the duplicate ROADMAP in a separate PR, a few other
issues were noted in README.md which are fixed here:
- the directory is project, not hack
- make.sh is no longer in the current dir since hack/ is not project/
anymore
- MAINTAINERS is no longer here as a markdown file, but is a TOML file
in the root of the project
- links were added to all files to make it easier to follow from here
to the appropriate location
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 9055eb0ce48b663013891d35dbd67978930ac0cb
Component: engine
2015-07-22 16:31:12 -04:00
