Eric Windisch
3edc88f76d
Restore AppArmor profile generation
...
Will attempt to load profiles automatically. If loading fails
but the profiles are already loaded, execution will continue.
A hard failure will only occur if Docker cannot load
the profiles *and* they have not already been loaded via
some other means.
Also introduces documentation for AppArmor.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-28 17:45:51 -04: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 68efb279af7afb
2015-07-28 10:58:17 -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
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
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
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
Chris Seto
83cb288575
Skip DockerSuite.TestExecResizeImmediatelyAfterExecStart on lxc
...
Signed-off-by: Chris Seto <chriskseto@gmail.com>
2015-07-27 19:20:15 -04: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
Doug Davis
8c9cd0418d
Merge pull request #15045 from cpuguy83/fix_dockercmdwitherror
...
Don't pass check.C to dockerCmdWithError
2015-07-27 16:04:16 -04:00
Sebastiaan van Stijn
8492e62306
Merge pull request #15041 from runcom/remove-saucy-from-installation-guide
...
Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
2015-07-27 21:39:55 +02:00
Vincent Demeester
18c7c67308
Lint on pkg/* packages
...
- pkg/useragent
- pkg/units
- pkg/ulimit
- pkg/truncindex
- pkg/timeoutconn
- pkg/term
- pkg/tarsum
- pkg/tailfile
- pkg/systemd
- pkg/stringutils
- pkg/stringid
- pkg/streamformatter
- pkg/sockets
- pkg/signal
- pkg/proxy
- pkg/progressreader
- pkg/pools
- pkg/plugins
- pkg/pidfile
- pkg/parsers
- pkg/parsers/filters
- pkg/parsers/kernel
- pkg/parsers/operatingsystem
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-27 21:26:21 +02:00
Vincent Demeester
5170a2c096
Lint fixes on runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-27 21:23:15 +02:00
David Calavera
0852170e8c
Merge pull request #14923 from Djelibeybi/fix14905
...
Switch to using only the RPM command to determine the distro version.
2015-07-27 12:01:57 -07:00
Josh Hawn
01d570ad30
[api/client] Fix build when context dir is symlink
...
Symbolic links in the context directory path are now evaluated.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-27 12:01:13 -07:00
Jessie Frazelle
d0215376f8
Merge pull request #15044 from jlhawn/fix_15042
...
[integration-cli] fix windows build test cases
2015-07-27 11:47:56 -07:00
Brian Goff
693ba98cb9
Don't pass check.C to dockerCmdWithError
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-07-27 14:33:32 -04:00
Josh Hawn
d06ffd0a5f
[integration-cli] fix windows build test cases
...
Use the same IP as the DOCKER_HOST when making a remote file server.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-27 11:30:38 -07:00
Jessie Frazelle
afac39d308
Merge pull request #15026 from duglin/Issue14837
...
Add a test for using -f w/git repo on build
2015-07-27 10:55:47 -07:00
Antonio Murdaca
1e43ce350d
Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-27 19:55:26 +02:00
Jessie Frazelle
db647c3b60
Merge pull request #15031 from liubin/typo/liubin-change-restart-command
...
Change restarting Docker daemon command in CentOS
2015-07-27 10:54:55 -07:00
Alexander Morozov
4dbdd98b41
Merge pull request #14547 from duglin/ErrDeadExec
...
Return 404 on exec-inspect when container is dead but exec is still around
2015-07-27 10:46:32 -07:00
Jessie Frazelle
6e1d887722
Merge pull request #13834 from hqhq/hq_memswap_change
...
Set default MemorySwap on Docker side
2015-07-27 10:46:10 -07:00
Jessie Frazelle
33bd41df94
Merge pull request #14118 from mountkin/fix-rmi-force
...
raise an error if rmi -f with multiple tags and running container
2015-07-27 10:42:07 -07:00
Jessie Frazelle
a62dabe0b4
Merge pull request #14278 from squaremo/separate_overlay_docs
...
Put the network UI and overlay docs in separate files
2015-07-27 10:41:17 -07:00
Jessie Frazelle
fdb932fa17
Merge pull request #14560 from bkeyoumarsi/volume-plugin-doc-fix
...
Updated volume-driver plugin api docs
2015-07-27 10:39:15 -07:00
Jessie Frazelle
f3af9c8bdb
Merge pull request #14735 from charleswhchan/patch-1
...
Minor edits to Environment variables section
2015-07-27 10:37:39 -07:00
Jessie Frazelle
2f5dc43ca2
Merge pull request #14852 from rhatdan/relabel
...
Rename internal field Relabel to Mode
2015-07-27 10:31:08 -07:00
