Commit Graph

17066 Commits

Author SHA1 Message Date
b82ed8bb95 Add integration cli trust tests
Added notary server to docker base image.
Created trust suite which runs trust server for running trusted commands.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 58a1de9b59594948df152f0003e759b77bcaa56a
Component: engine
2015-07-24 14:08:20 -07:00
7e6fe45a4f Use notary library for trusted image fetch and signing
Add a trusted flag to force the cli to resolve a tag into a digest via the notary trust library and pull by digest.
On push the flag the trust flag will indicate the digest and size of a manifest should be signed and push to a notary server.
If a tag is given, the cli will resolve the tag into a digest and pull by digest.
After pulling, if a tag is given the cli makes a request to tag the image.

Use certificate directory for notary requests

Read certificates using same logic used by daemon for registry requests.

Catch JSON syntax errors from Notary client

When an uncaught error occurs in Notary it may show up in Docker as a JSON syntax error, causing a confusing error message to the user.
Provide a generic error when a JSON syntax error occurs.

Catch expiration errors and wrap in additional context.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: ed13c3abfb242905ec012e8255dc6f26dcf122f6
Component: engine
2015-07-24 14:08:20 -07:00
6e333c54df Vendor notary
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: f5a4a8da15f5cbe6abf8d7b67211c75791c78ebf
Component: engine
2015-07-24 01:31:50 -07:00
ffb11d4bf7 Add cmdline docs for signing and verification flows
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
Upstream-commit: 48250832a3dd4b93ee7f61035b5b8176febfb55f
Component: engine
2015-07-24 01:31:50 -07:00
c0e5c2c227 Merge pull request #14835 from aaronlehmann/registry-lint-cleanup
Improve documentation and golint compliance of registry package
Upstream-commit: 84e917b8767c749b9bd1400a5a2253d972635bcf
Component: engine
2015-07-24 16:23:23 -04:00
4d9279a3fb Improve documentation and golint compliance of registry package
* Add godoc documentation where it was missing

* Change identifier names that don't match Go style, such as INDEX_NAME

* Rename RegistryInfo to PingResult, which more accurately describes
  what this structure is for. It also has the benefit of making the name
  not stutter if used outside the package.

Updates #14756

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 4fcb9ac40ce33c4d6e08d5669af6be5e076e2574
Component: engine
2015-07-24 11:55:07 -07:00
87384af4bd Merge pull request #14964 from tiborvass/fix-reexec
reexec: Use in-memory binary /proc/self/exe on linux instead of os.Args[0]
Upstream-commit: 44e327b29e1dfb699d28cf80bec411597014aa4d
Component: engine
2015-07-24 11:51:56 -07:00
d7e24680cc reexec: Use in-memory binary on linux instead of os.Args[0]
This keeps reexec working properly even if the on-disk binary was replaced.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5aee8807a67687941916fc85c6d4da6bc59e834b
Component: engine
2015-07-24 14:15:50 -04:00
3a3c8d2e29 Merge pull request #14920 from jfrazelle/release-script-updates-for-new-repo
warn the script is depreciated
Upstream-commit: e1dea0c4854ba413f492b30f279e217337451034
Component: engine
2015-07-24 11:09:35 -07:00
4dd6589d1e warn the script is depreciated
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: ff271f5190c45cb099cb40f72fdae860f9cbb8b3
Component: engine
2015-07-24 10:34:41 -07:00
a7cda977e7 Merge pull request #14958 from LK4D4/fix_valid
Fix option validation for log-drivers without it
Upstream-commit: 3a07e7d115626a4658a6c0d222c467c033cf66c3
Component: engine
2015-07-24 09:57:36 -07:00
3fc3a860d8 Merge pull request #14865 from calavera/update_init_scripts
Update init scripts to use `docker daemon`.
Upstream-commit: 4eee075f222082940690a385ec62923dd9303909
Component: engine
2015-07-24 09:47:03 -07:00
ffc7323b60 Fix option validation for log-drivers without it
There is no option validation for "journald" log-driver, so it makes no
sense to fail in that case.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d68c55bc72625bce226971ef6e760530e9a15ce3
Component: engine
2015-07-24 09:00:53 -07:00
9bb78c67ff Merge pull request #14877 from calavera/deprecate_docker_d
Add -d to the deprecated feature list for 1.8.
Upstream-commit: f32295eda62192916637d24fe7e3d987c2bc4236
Component: engine
2015-07-24 17:44:23 +02:00
e54fe5cfea Merge pull request #14925 from calavera/fix_volume_symlink_test
Remove reference to old Volumes field in inspect struct.
Upstream-commit: 9c0bb22571eca47246a210ddfdae7c7eaedb800f
Component: engine
2015-07-24 10:41:00 -04:00
fd5b332b83 Merge pull request #14700 from charleswhchan/patch-2
Add benefit to using automated build.
Upstream-commit: 58bab11ee298db92fa7db9c99d058b92d58fed54
Component: engine
2015-07-24 08:22:59 +02:00
f574cabfab * Add benefit to using automated build.
* Wording based on suggestions by @thaJeztah, @moxiegirl in PR #14700.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: c9ff01ffc74c04d07933118d6275674bdd514c71
Component: engine
2015-07-23 21:01:23 -07:00
fa96a081c8 Merge pull request #13771 from tiborvass/daemon-cli
New `docker daemon` command
Upstream-commit: 7674f2168642f0c9012e20db8ac27ce09ecb2983
Component: engine
2015-07-23 19:30:39 -07:00
3e3c660339 Merge pull request #14696 from rtrauntvein/patch-1
Fix link to examples documentation
Upstream-commit: 163acd07e24a15fb96face9395f9283a47cd3e2f
Component: engine
2015-07-23 18:25:31 -07:00
599104b3e2 Merge pull request #14926 from dmcgowan/prune-tar-split
Fix pruning in vendor script
Upstream-commit: d5e085572d6d85a41c2e01517e8684ad4fcb75ff
Component: engine
2015-07-23 17:43:17 -07:00
fbf6d59e07 Update docs to use the new docker daemon command
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e246f1e4eec3290f343627e73a926b940b77b121
Component: engine
2015-07-23 20:31:43 -04:00
4f814a612a Add and modify tests for legacy and new daemon invokations
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e7fc632147e40f5a243158e8378082c51a3d952e
Component: engine
2015-07-23 20:31:43 -04:00
07938abda9 Add index.md to examples docs
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com>
Upstream-commit: 4f62dec548f47634e75ef9a0238de2bddc5bee33
Component: engine
2015-07-23 17:24:44 -07:00
824a07c06c Merge pull request #14919 from tianon/empty-ps-headers
Fix "docker ps" with no containers regression
Upstream-commit: cd9dd552337ea4ca9a007e8a00eb8cd6f74b3143
Component: engine
2015-07-23 16:52:43 -07:00
12234c67d4 cli: new daemon command and new cli package
This patch creates a new cli package that allows to combine both client
and daemon commands (there is only one daemon command: docker daemon).

The `-d` and `--daemon` top-level flags are deprecated and a special
message is added to prompt the user to use `docker daemon`.

Providing top-level daemon-specific flags for client commands result
in an error message prompting the user to use `docker daemon`.

This patch does not break any old but correct usages.

This also makes `-d` and `--daemon` flags, as well as the `daemon`
command illegal in client-only binaries.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 96ce3a194aab2807fdd638825b9ea7cb9ba55c36
Component: engine
2015-07-23 19:44:46 -04:00
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
8d26f588ee Keep license files
Currently the vendor script removes directories which do not have imported go packages, however this also ends up removing license files which may be other directories.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 82685367d8d5087b16a583123f45fdcb1c7c64dc
Component: engine
2015-07-23 16:12:21 -07:00
b52c35c14d Remove reference to old Volumes field in inspect struct.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bb43bdf6c5272976215f74240ffd9db4d5fd2a3a
Component: engine
2015-07-23 16:10:31 -07:00
3221713ea7 Fix pruning on tar split
Currently the vendor script prunes files which are currently checked in.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a8546df89d1670c0f0edc9dab78cef611b42e929
Component: engine
2015-07-23 15:21:32 -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
3dbbf38be7 Fix "docker ps" with no containers regression
The header row was not being printed when "docker ps" was invoked without containers thanks to the new format support, and we instead received a single blank line.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: f57fc03e3b39c225a05edfe217bd7616949d0dd0
Component: engine
2015-07-23 13:23:24 -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