0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
17232 commits 14 branches 412 tags 338 MiB
Commit graph

17232 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Walsh
90b8cebda6 Labels on network content need to be shared if shared network namespace 
If I run two containers with the same network they share the same /etc/resolv.conf.
The current code changes the labels of the /etc/resolv.conf currently to the
private label which causes it to be unusable in the first container.

This patch changes the labels to a shared label if more then one container
will use the content.

Docker-DCO-1.1-Signed-off-by: Dan Walsh dwalsh@redhat.com (github: rhatdan)

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-07-29 12:42:28 -04:00
Sebastiaan van Stijn
60ed0a7f77 Merge pull request #15117 from ChanderG/master 
Fix minor formatting error in security article docs
 2015-07-29 13:41:19 +02:00
Chander G
6cf0e27ee0 Fix minor formatting error in security article docs 
Signed-off-by: Chander G <chandergovind@gmail.com>
 2015-07-30 01:06:04 +05:30
Tibor Vass
c19a00d4cb Merge pull request #15060 from jlhawn/fix_build_renamed_dockerfile 
[api/client] update check Dockerfile in Context
 2015-07-28 21:30:19 -04:00
moxiegirl
ed1d9d022d Merge pull request #14565 from moxiegirl/14561-mac-rewrite 
Docker Toolbox Updates fixes #14561
 2015-07-28 18:20:26 -07:00
Mary Anthony
6ca22add18 Docker Toolbox Updates fixes #14561 
- Tested Mac/iterated with Jeff on fixes
- Waiting on formal uninstall;manual now
- 4 hour work
- Fixe #14562 converting Windows to Mac
- Found errors in installer need fixes/another iteration
- Updated as far as possible with limited installation
- 3 Hours work
- Entering comments from PR review
- New screen captures and migration material
- Entering Sven's comment
- Testing with powershell, Seb's comments
- Fix link in upgrade
- Minor tweaks to http and typos
- Adding deprecation note

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-28 18:17:24 -07:00
Tibor Vass
cc6138d946 Merge pull request #15063 from jfrazelle/only-write-distributions-file-if-dne 
only write distributions file if dne
 2015-07-28 20:45:04 -04:00
Alexander Morozov
f809037128 Merge pull request #14848 from hqhq/hq_golint_execdriver 
Fix golint warnings for daemon/execdriver/*
 2015-07-28 14:23:22 -07:00
Alexander Morozov
2c162292b7 Merge pull request #14824 from fcantournet/lint_pkg_mflag 
Fix golint for pkg/mflag
 2015-07-28 13:51:09 -07:00
Alexander Morozov
9cfc223cc0 Merge pull request #14818 from MHBauer/volume-lint 
lint for volume/*
 2015-07-28 13:42:18 -07:00
Sebastiaan van Stijn
bfbac726c7 Merge pull request #15082 from ChanderG/master 
Add link to Systemd article in Debian Jessie docs, fix typo
 2015-07-28 22:35:48 +02:00
Chander G
b9e6be25d1 Add link to Systemd article, fix typo 
Signed-off-by: Chander G <chandergovind@gmail.com>
 2015-07-29 01:54:44 +05:30
Jessie Frazelle
e06df594f5 Merge pull request #14863 from brahmaroutu/lint_daemon_graphdriver_aufs 
daemon/graphdriver/aufs fix lint errors/warnings
 2015-07-28 11:46:40 -07:00
Jessie Frazelle
be60047b43 Merge pull request #14932 from brahmaroutu/lint_daemon_graphdriver_graphtest 
daemon/graphdriver/graphtest/ fix lint errors/warnings
 2015-07-28 11:20:33 -07:00
Sebastiaan van Stijn
f989d68014 Merge pull request #15096 from kolyshkin/doc-fixes-2 
daemon.md: do fix placement of exec driver heading
 2015-07-28 20:10:11 +02:00
Kir Kolyshkin
f52514a038 daemon.md: do fix placement of exec driver heading 
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.

Now, this is the second time I am fixing this. First time
it was commit 68efb27, but the following commit 9af7afb
screwed it up again, so the header appears twice now.

Get rid of the the wrong one.

Cc: David Calavera <david.calavera@gmail.com>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2015-07-28 10:58:17 -07:00
Morgan Bauer
9af963aba0
lint fixes for volume/* 
- comments on exported values
 - constant string replaced by constant reference
 - unexport implementation details of VolumeDriver 'local'
 - add fixed packages to linter list

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-07-28 10:40:44 -07:00
David Calavera
c473ae14fd Merge pull request #15094 from Microsoft/10662-fixvendorhelper 
Windows: Fix vendor-helpers.sh
 2015-07-28 10:17:30 -07:00
John Howard
663d50464e Windows: Fix vendor-helpers.sh 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-28 10:13:33 -07:00
Félix Cantournet
8e6ad2171a Fix golint for pkg/mflag 
Signed-off-by: Félix Cantournet <felix.cantournet@cloudwatt.com>
 2015-07-28 15:32:42 +02:00
moxiegirl
3a7b4230b2 Merge pull request #14713 from moxiegirl/remove-boot2docker-14563 
Remove references to boot2docker replace with docker-machine
 2015-07-28 06:05:29 -07:00
Srini Brahmaroutu
55885daa56 daemon/graphdriver/aufs fix lint errors/warnings 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-28 06:17:05 +00:00
Srini Brahmaroutu
12460f41a4 daemon/graphdriver/graphtest/ fix lint errors/warnings 
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-28 06:01:00 +00:00
Mary Anthony
1825e06944 Remove references to boot2docker replace with docker-machine 
- boot2docker is deprecated in the 1.8.0
- docker-machine replaces it
- this fixes #14563
- Updating with thaJetzah comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-27 18:25:50 -07:00
Jessie Frazelle
4ed3e3a5b2 Merge pull request #14694 from Microsoft/10662-apparmorprofile 
Windows: Factoring out unused fields
 2015-07-27 18:18:54 -07:00
John Howard
47c56e4353 Windows: Factoring out unused fields 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-27 17:44:18 -07:00
Qiang Huang
4862d723a4 Add daemon/execdriver/* to validate-lint 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-28 08:44:12 +08:00
Qiang Huang
3d17c3bb66 Fix golint warnings for daemon/execdriver/* 
Addresses: #14756

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-28 08:43:22 +08:00
Tibor Vass
8ad1d3fec6 Merge pull request #15067 from aaronlehmann/term-windows-golint 
Fix golint nit in term_windows.go
 2015-07-27 20:43:18 -04:00
Aaron Lehmann
35e498beca Fix golint nit in term_windows.go 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-07-27 17:40:49 -07:00
Jessie Frazelle
33358f80e5 Merge pull request #14838 from Microsoft/10662-ansirewrite 
Windows: CLI Improvement (TP3)
 2015-07-27 17:30:14 -07:00
Jessie Frazelle
f32cab874c Merge pull request #15034 from aaronlehmann/update-vendored-distribution 
Update vendored distribution repo to new version
 2015-07-27 17:24:35 -07:00
Jessie Frazelle
f3c23fc463 Merge pull request #15062 from chrisseto/master 
Skip DockerSuite.TestExecResizeImmediatelyAfterExecStart on lxc
 2015-07-27 17:20:20 -07:00
Jessica Frazelle
2eee192366 only write distributions file if dne 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-27 16:26:35 -07:00
Chris Seto
83cb288575 Skip DockerSuite.TestExecResizeImmediatelyAfterExecStart on lxc 
Signed-off-by: Chris Seto <chriskseto@gmail.com>
 2015-07-27 19:20:15 -04:00
Josh Hawn
af06d289e4 [api/client] update check Dockerfile in Context 
Actually determine the relative path of the Dockerfile to the context
directory. Error out if the relative path starts with "../".

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-07-27 16:11:36 -07:00
Jessie Frazelle
7886056d74 Merge pull request #15059 from calavera/fix_overlay_comments_typo 
Fix typo in overlay's create godoc.
 2015-07-27 15:40:22 -07:00
David Calavera
5bac5302e5 Fix typo in overlay's create godoc. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-27 15:37:26 -07:00
Jessie Frazelle
25c42cc0d0 Merge pull request #14759 from vdemeester/pkg-golint 
golint on some pkg/* packages
 2015-07-27 15:19:46 -07:00
Michael Crosby
bdc55be9b4 Merge pull request #15039 from jlhawn/fix_build_context_is_symlink 
[api/client] Fix build when context dir is symlink
 2015-07-27 15:11:36 -07:00
Jessie Frazelle
72afd792fd Merge pull request #15055 from calavera/log_release_steps 
Log each release step.
 2015-07-27 15:03:29 -07:00
Jessie Frazelle
0fe564cbb6 Merge pull request #15051 from LK4D4/32bit_const 
Use math.MaxInt32 instead of math.MaxUint32
 2015-07-27 15:02:40 -07:00
Jessie Frazelle
542de786c2 Merge pull request #14751 from vdemeester/runconfig-lint 
golint fixes on runconfig
 2015-07-27 15:01:08 -07:00
David Calavera
776600fabb Log each release step. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-27 14:28:05 -07:00
Sebastiaan van Stijn
e5af7a0e86 Merge pull request #14963 from MHBauer/plugins-links 
Fix Plugins links
 2015-07-27 23:25:48 +02:00
Jessie Frazelle
df75411b0f Merge pull request #15050 from DieterReuter/fix-bash-completion 
Fix file mode for docker bash completion
 2015-07-27 14:24:49 -07:00
Sebastiaan van Stijn
967bc13ae6 Merge pull request #15052 from MHBauer/ubuntu-docs 
Fix interrupted numbering sequence in ubuntu installation docs
 2015-07-27 22:45:51 +02:00
Alexander Morozov
eb45602d2f Use math.MaxInt32 instead of math.MaxUint32 
I think it was original intention, because even half of a comment was about
MaxInt32.

Fix #15038

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-27 13:11:16 -07:00
Morgan Bauer
289e0d244b
Fix interrupted numbering sequence in ubuntu installation docs 
- increase indent of note to match surrounding text

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-07-27 13:10:29 -07:00
Dieter Reuter
37169dadda Fix file mode for docker bash completion 
A bash completion file shouldn't have a executable bit set.
Just change file mode to 644 (instead of 755).

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
 2015-07-27 22:07:04 +02:00