Commit Graph

17287 Commits

Author SHA1 Message Date
Josh Hawn bb2e6c72d2 [api/client] Tag resolved digest from Dockerfile
Builds where the base images have been resolved to trusted digest
references will now be tagged with the original tag reference from
the Dockerfile on a successful build.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-28 17:54:48 -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
root 351f6b8ec0 api/server fix golint errors/warnings.
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-28 22:44:39 +00:00
Eric Windisch 6c887be769 Mark engine AA policy as complain-only
The engine policy will now only complain
as a temporary measure to ensure we do not
cause breakages while users exercise this
policy.

This is NOT the policy for containers, but
for the newly-introduced policy for the
daemon itself.

Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-28 17:45:53 -04:00
Eric Windisch 8b2fcddcd2 AA: Eliminate 'file' permission
Implements the policies for the remaining binaries
called by the Docker engine and eliminates the
giant whitelisted 'all files' permission in favor
of granular whitelisting and child-specific policies.

It should be possible now to remove the 'file' permission,
but for the sake of keeping Docker unbroken, we'll try
to gradually tighten the policy.

Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-28 17:45:53 -04:00
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
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
Vincent Batts 273f50c741 graphdriver/*: expect uncompressed tar for ApplyDiff
The `ApplyDiff` function takes a tar archive stream that is
automagically decompressed later. This was causing a double
decompression, and when the layer was empty, that causes an early EOF.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-07-28 16:36:39 -04:00
Vincent Batts 56bf275e32 archive, chrootarchive: split out decompression
In `ApplyLayer` and `Untar`, the stream is magically decompressed. Since
this is not able to be toggled, rather than break this ./pkg/ API, add
an `ApplyUncompressedLayer` and `UntarUncompressed` that does not
magically decompress the layer stream.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-07-28 16:36:38 -04: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
David Calavera 621e3d8587 Keep backwards compatibility in kill api.
Return an error when the container is stopped only in api versions
equal or greater than 1.20 (docker 1.8).

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-28 12:25:36 -07:00
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
Derek McGowan e863a07b89 Fix login and search TLS configuration
Currently login and search do not load per registry certificates.
This is a regression caused by the last refactor since this was recently fixed.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-28 10:36:57 -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
Qiang Huang ada852aa70 Merge daemon_unit_test.go to daemon_test.go
daemon_test.go supposted to be unit test for daemon, so
don't see reason why we need another daemon_unit_test.go.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-28 15:36:29 +08: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