Phil Estes
d18dfea156
Add info on how to build experimental binaries
...
..also update the text that says "TO.BE.DETERMINED" to the actual URL
where the experimental nightlies are published.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 3f8d60ac2f7c62aa9b9128af0ebbb9aa1bad6ad1
Component: engine
2015-08-14 16:45:38 -04:00
David Calavera
42a96fd466
Merge pull request #15065 from calavera/new_release_branch_workflow
...
Make the release process more atomic between major releases.
Upstream-commit: 54b50479af00f88746cd719fe01fb6d60c632f25
Component: engine
2015-08-13 16:10:11 -07:00
Jessie Frazelle
da97ba6880
Merge pull request #15545 from LK4D4/refactor_pullv2
...
Refactoring of pullV2Tag
Upstream-commit: b93d99b25d2d0797d985c4529292435c74da75c3
Component: engine
2015-08-13 15:52:14 -07:00
Jessie Frazelle
53cf427573
Merge pull request #15367 from hqhq/hq_update_rpm_deb_desc
...
Tiny fix for rpm and deb descriptions
Upstream-commit: 46d9fd6a11968e53bf18677ab9a44f3aec4edf21
Component: engine
2015-08-13 15:04:50 -07:00
Sebastiaan van Stijn
f1cc5568e9
Merge pull request #13501 from vdemeester/8048-image-repository-tag
...
Fix #8048 : make `docker images repository:tag` work
Upstream-commit: c6c195a465652e96b06e76b44a1df075cba9ad80
Component: engine
2015-08-13 21:36:21 +02:00
Alexander Morozov
8771bcf9d5
Refactoring of pullV2Tag
...
* use downloadInfo pointers everywhere
* use downloads slice only for things that we really download
* cleanup tmp files in all cases
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9b2426c606b92fa37b7484d9d884edd43352b69c
Component: engine
2015-08-13 11:50:19 -07:00
Sebastiaan van Stijn
6c6e94b0e5
Merge pull request #15560 from docker/patch-bad-formatting
...
Fixing bad formatting reported by David via email
Upstream-commit: 599b76000d64cd4771410513812fe3560467f82b
Component: engine
2015-08-13 20:26:05 +02:00
Jessie Frazelle
683400e786
Merge pull request #15559 from liusdu/liusdu-type
...
fix a typo in graph/graph.go
Upstream-commit: 355f640d4d6c7f4cd4e3dafedd7f8eb5a8f2d0c5
Component: engine
2015-08-13 09:33:00 -07:00
Jessie Frazelle
8d8081f715
Merge pull request #15563 from ankushagarwal/changelog
...
Add 1.8.1 CHANGELOG
Upstream-commit: 53812e51f42249c8339ffa181438a66d0bde2864
Component: engine
2015-08-13 09:28:31 -07:00
Ankush Agarwal
42e8a805e7
Add 1.8.1 CHANGELOG
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 4ac8fd98b302a2404a9438762d97f65e15f7a015
Component: engine
2015-08-13 09:02:04 -07:00
Sebastiaan van Stijn
2a1429c0c6
Merge pull request #15451 from liubin/liubin/fix-broken-link
...
fix broken link to wiki
Upstream-commit: 6b1b1ad31cc0b0433ec33743488b40d8f1919894
Component: engine
2015-08-13 17:03:41 +02:00
moxiegirl
d1f9849564
Merge pull request #15554 from HuKeping/docs-notary
...
Docs: some fix about notarysandbox
Upstream-commit: 68a4beeba47c1bf0084449896e0f9d331fcdd041
Component: engine
2015-08-13 07:47:35 -07:00
bin liu
a65c38b101
fix broken link to glossary page.
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: f6753cd9635b294f1463ef7fb6952dd2a74c0a69
Component: engine
2015-08-13 22:40:20 +08:00
moxiegirl
13929d0935
Fixing bad formatting reported by David via email
...
Fixed and tested
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ef453f7118d704319768d8d9c0cfe79e2d521afa
Component: engine
2015-08-13 06:42:26 -07:00
Liu Hua
b52277b7fd
fix a typo in graph/graph.go
...
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
Upstream-commit: 883fcfe4256d5d5bf1b3bfbced61fa585fe07a73
Component: engine
2015-08-13 20:01:43 +08:00
Hu Keping
155dc9b901
Docs: some fix about notarysandbox
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 79aac6584de8c5cd1797933f20b6d9b1c2fa33e9
Component: engine
2015-08-13 16:53:05 +08:00
Vincent Demeester
d024131050
Fix #8048 : make docker images repository:tag work
...
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.
Closes #8048 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4fb88d2e11f2f16c520b36e4c6e00db44ae26b8c
Component: engine
2015-08-13 08:50:09 +02:00
moxiegirl
2c3fdeb15a
Merge pull request #15541 from thaJeztah/hashtag-space
...
docs: fix fedora prerequisites heading
Upstream-commit: 650feb29f10bc2775877579c67534646949610f2
Component: engine
2015-08-12 19:33:38 -07:00
Jessie Frazelle
31dca249c8
Merge pull request #15543 from icecrime/15536_partial_manifest
...
Fix partial manifest push
Upstream-commit: 30cf473f262a8b481c868d99839efdb24154f22e
Component: engine
2015-08-12 19:19:07 -07:00
Arnaud Porterie
6bdf36a6da
Merge pull request #15399 from Microsoft/10662-portmapping
...
Windows: [TP3] Enable NAT port mapping
Upstream-commit: 72e55cb0eca82017cd696e0a0d41e40be43086a1
Component: engine
2015-08-12 19:07:14 -07:00
Arnaud Porterie
f6cb9362d1
Update regression test
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 697cdb8e2f288190034b9f72bbd747d02d9643da
Component: engine
2015-08-12 18:46:55 -07:00
Arnaud Porterie
6585a8728e
Revert #14884
...
This reverts commit 810d3b2642d4a82dc186d6eff8c2e487ee624bc5.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 4f3b0d0f4ad046a5180f524ba320990c67282dd0
Component: engine
2015-08-12 18:46:48 -07:00
Sebastiaan van Stijn
c193653d08
Merge pull request #15521 from albers/changelog-rollover
...
[Fix 15520] wrong feature description (rollover) in changelog
Upstream-commit: e26ee9a31780f72556a0b7777af44561ff84bbdd
Component: engine
2015-08-13 02:17:42 +02:00
David Calavera
534bcd14d8
Merge pull request #15449 from albers/completion-help
...
Remove -h flag from completion and daemon reference
Upstream-commit: d50881e446c4f230099e41124fda481849e82222
Component: engine
2015-08-12 17:09:51 -07:00
Sebastiaan van Stijn
8998990826
docs: fix fedora prerequisites heading
...
Fixes the prerequisites heading not being
rendered properly, because of a missing space.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2c18e1cd053895cd1ef28ec940d4be7f94c97604
Component: engine
2015-08-13 01:29:10 +02:00
John Howard
3c87acb006
Windows: Enable NAT port mapping
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4393be71005e63ab305f4d87481dbd23b7594d18
Component: engine
2015-08-12 13:17:27 -07:00
Alexander Morozov
a6883223e5
Merge pull request #15531 from Microsoft/10662-buildercommands
...
Windows: Error on unsupported builder command
Upstream-commit: d50d56b35213e7d38437b76af28131a4cf3458d3
Component: engine
2015-08-12 13:13:03 -07:00
Alexander Morozov
187778eec2
Merge pull request #15504 from kolyshkin/zfs-nitpicks
...
zfs nitpicks
Upstream-commit: d8ff9ef2b5349b111d09d791fcbc81e1d9deab30
Component: engine
2015-08-12 11:54:35 -07:00
Jessie Frazelle
60f12fa9b0
Merge pull request #15446 from cpuguy83/better_err_on_exec_err
...
Return better errors from exec
Upstream-commit: d3198fa8c4f704a2ddd4d876003757b30a61c00c
Component: engine
2015-08-12 11:13:29 -07:00
John Howard
0baccb159d
Windows: Error on unsupported builder command
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 394ccfac0782d9877b430b5c7ef75374edcb94e8
Component: engine
2015-08-12 10:02:23 -07:00
moxiegirl
8aaf7ef170
Merge pull request #15450 from liubin/liubin/change-port-number-through-example
...
change port number through example context
Upstream-commit: 8a0efadee14769f39abb0b3c67a2c794dc973443
Component: engine
2015-08-12 09:49:50 -07:00
Jessie Frazelle
427a5313d8
Merge pull request #15183 from jfrazelle/test-install-script
...
add file to test install script
Upstream-commit: e82358586d62413c598b81df4c2d9af6045ee53d
Component: engine
2015-08-12 09:49:35 -07:00
Harald Albers
bb2fd1f392
Fix wrong feature description (rollover) in changelog
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 967c50cfe919d89c5b526a55f20bbce1c21c9b70
Component: engine
2015-08-12 04:20:16 -07:00
Arnaud Porterie
f4c29d8ab3
Merge pull request #15512 from moxiegirl/fix-links-checker
...
Fixes after release
Upstream-commit: dc945f5559f14d2a03e67b8e71ff7ec90323b058
Component: engine
2015-08-11 23:15:04 -07:00
Mary Anthony
a3fa37d61e
Fixes after release
...
Adding in a link about the deprecated material
Fixing bad link to staging
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 8b09f8a302eaf7d73015112a774010e57e7f2c25
Component: engine
2015-08-11 23:13:14 -07:00
Kir Kolyshkin
baa28c0e1c
graphdriver/zfs: fix GetMetadata() comment
...
Commit e27c904 added a wrong and misleading comment
to GetMetadata(). Fix it using the wording from
commit 407a626 which introduced GetMetadata().
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
Upstream-commit: 15a232fd06e062f8aae4e89e1f520f44c875daeb
Component: engine
2015-08-11 18:16:11 -07:00
Kir Kolyshkin
9192baac2d
graphdriver/zfs: privatize mountPath and zfsPath
...
These functions are not part of the graphdriver.Driver
interface and should therefore be private.
Also, remove comments added by commit e27c904 as they are
* pretty obvious
* no longer required by golint
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
Upstream-commit: f5f7fee2ecc964314b2a7b910fda71a157c90f16
Component: engine
2015-08-11 18:16:08 -07:00
Alexander Morozov
575411533d
Merge pull request #15502 from mrunalp/fixup_comment
...
Fix incorrect comment
Upstream-commit: f5e2c6f14baf7789a2b8f2fc3b66dba1d4174c91
Component: engine
2015-08-11 16:53:23 -07:00
Mrunal Patel
b585740325
Fix incorrect comment
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: d626f77e36e16911358248af678cc00900a6f5b5
Component: engine
2015-08-11 19:45:23 -04:00
Jessie Frazelle
090c29f3a8
Merge pull request #15377 from jfrazelle/do-not-keep-old-experimental-debs
...
do not keep old debs for experimental
Upstream-commit: 13873e6841367dc5d00f641e9a5eac967e7aa203
Component: engine
2015-08-11 16:35:55 -07:00
Jessica Frazelle
313dca405d
fix oracle linux install
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 0eade329dc1b75424dfc71a110d1848498b3d153
Component: engine
2015-08-11 16:33:14 -07:00
Jessica Frazelle
988c46b306
add file to test install script
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 83416f68deb6ff94ffa1803b90bb9a9cd4e2ca78
Component: engine
2015-08-11 16:31:58 -07:00
David Calavera
93f026e522
Merge pull request #15485 from calavera/merge_release_v1.8.0
...
Bump version to 1.8.0 in master
Upstream-commit: 0e3674d7d0afeb20eddc61c2acfe72db6ef033dc
Component: engine
2015-08-11 13:38:57 -05:00
David Calavera
b12e028813
Bump dev version to 1.9.0-dev
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a09ba62d187d9ea56cc58f757594367686af8981
Component: engine
2015-08-11 10:21:12 -05:00
David Calavera
8b78a09991
Bump version to 1.8.0
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: e8736860177be65b2a2f50437d1214026de1384b
Component: engine
2015-08-11 10:20:47 -05:00
David Calavera
e580f885da
Make the release process more atomic between major releases.
...
Rather than keeping a branch named "release" where we merge every release,
we want to keep "disposable" release branches for each release.
This will make much easier to create new major releases, since we always
want to start these releases from what we have in master. We create a
disposable release branch from master that we'll only use during the lifecycle
of the major release.
Once the release branch is created, the release captain will use a "bump" branch
in her own fork to cherry pick changes that will need to be applied to this
release. We'll track those changes in a pull request between the disposable release
branch and the bump branch.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: bca8159174f05b40e7d4379142052f4200987654
Component: engine
2015-08-11 10:09:25 -05:00
David Calavera
b3cd3aa03a
Merge pull request #15474 from tonistiigi/network-ui-endpoints-windows
...
Mark network ui endpoints unix-only
Upstream-commit: 3e596da9eaa38e2f0d2778a896f3d566c96c70eb
Component: engine
2015-08-11 09:32:09 -05:00
Harald Albers
f68b6c3486
Remove -h flag from completion and daemon reference
...
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.
`-h` is not included in the help messages of the commands, though.
It ist visible in
* reference: only in `docker daemon` reference,
see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
see output of `grep -RF '**-h**' man`
For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ceb11d966034f4b4308abf4fc2826b4c840b6e99
Component: engine
2015-08-11 07:30:58 -07:00
Jessie Frazelle
28939da7a8
Merge pull request #15473 from jfrazelle/minor-cosmetic-change
...
minor cosmetic change to client output on pull
Upstream-commit: beab255cc02da5e95e30334c1b71348b279fbbfd
Component: engine
2015-08-10 23:20:05 -07:00
Jessica Frazelle
c0287afaeb
minor cosmetic change to client output on pull
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 8bd632276069d7057406aa6ea151296cf5bbbd2f
Component: engine
2015-08-10 21:54:03 -07:00