Commit Graph

15907 Commits

Author SHA1 Message Date
ed5b93d380 Merge pull request #14720 from icecrime/14662_document_branches_tags
Document branches and tags
Upstream-commit: c051ed795347762fd53b3f9286c0f85402df5c42
Component: engine
2015-07-25 13:12:47 +02:00
7a78f67eef Merge pull request #14941 from hqhq/hq_cli_remove_cleanup
Remove unnecessary container cleanup in integration-cli
Upstream-commit: 6b12d37cedc3c4c9287d1dcdb1fc831f46e49ee6
Component: engine
2015-07-24 20:38:15 -07:00
abb442b01d Merge pull request #14979 from runcom/fix-flacky-TestRunNonRootUserResolvName
Fix TestRunNonRootUserResolvName flackiness
Upstream-commit: afb831d35e62139c9e7a214a471c3dd956076223
Component: engine
2015-07-24 21:50:44 -04:00
32e08b641b Merge pull request #14966 from mrjana/vendor18
Vendoring libnetwork
Upstream-commit: 5bdd4d0ec46ab071bbb633dde60b97b28911ade6
Component: engine
2015-07-24 17:58:23 -07:00
6a640c48bd Fix TestRunNonRootUserResolvName flackiness
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 30d4c70d282248ac218c6c505d5a316e5cc9ac01
Component: engine
2015-07-25 02:45:17 +02:00
4f2862dc8f Merge pull request #14546 from dmcgowan/trusted-notary-integration
Notary integration
Upstream-commit: 4f5b677fd9808b34382061c458e13d3930516889
Component: engine
2015-07-24 17:44:14 -07:00
d3667a22b6 Merge pull request #14976 from calavera/revert_unconfined_aa_policy
Revert "Introduce a dedicated unconfined AA policy"
Upstream-commit: 542685d856cad45b602e018baf36d7b268cbdfdc
Component: engine
2015-07-24 17:31:28 -07:00
2e3d5aed9b Vendoring libnetwork
Vendoring libnetwork commit f1c5671f1ee2133055144e566cd8b3a0ae4f0433

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 2ad81da856c123acf91eeff7ab607376bd27d9ba
Component: engine
2015-07-24 17:11:47 -07:00
b150028a1c Document branches and tags
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: e4c77b047d7b9e69b7d569b867f4dd314128feda
Component: engine
2015-07-24 16:56:30 -07:00
520269a284 Merge pull request #14935 from stevvooe/registry-moratorium
Impose moratorium on remote registry access
Upstream-commit: 78906612a2e2081a517ab0cbfe6cb4b7b7787911
Component: engine
2015-07-24 16:45:05 -07:00
6574e4057c Merge pull request #14977 from jfrazelle/fix-lxc
fix lxc
Upstream-commit: 935810bd20cca725d52c10ca7759353681af961e
Component: engine
2015-07-24 16:43:46 -07:00
61a71388a8 Revert "Introduce a dedicated unconfined AA policy"
This reverts commit 87376c3add7dcd48830060652554e7ae43d11881.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 94ab0d312fedaf063a6487c6b1b8b7b97221d24a
Component: engine
2015-07-24 16:35:51 -07:00
99a373ceb8 Rename to flags and environment variables to content trust
Update help line to allow 90 characters instead of 80

The trust flag pushes out the help description column wider, requiring more room to display help messages.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 259cadb0b19a9049302e78fec529b0105efabb1d
Component: engine
2015-07-24 16:31:18 -07:00
e5887c6923 Added tests for expired snapshots and timestamps
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: 3e90b12d42f6f937639edafa4b2ddc12badf8895
Component: engine
2015-07-24 16:31:18 -07:00
937cba2db1 Add tests simulating an evil server
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
Upstream-commit: 268fa5af4768f7b1df32501d5f7ba0daba2c2da1
Component: engine
2015-07-24 16:31:18 -07:00
97834446bf Add build integration cli tests
Clean up tests to remove duplicate code

Add tests which run pull and create in an isolated configuration directory.
Add build test for untrusted tag

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 871d2b96ed5cf234c41a5e731a34fc9deda4e9f1
Component: engine
2015-07-24 16:31:12 -07:00
5944bec2a8 ignore certain tests on lxc driver
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 0a5b8c40c088c90abb8e3410b92758ed603836d9
Component: engine
2015-07-24 16:10:59 -07:00
fb69445f42 Merge pull request #14969 from tianon/utopic-eol
Remove Ubuntu 14.10 (Utopic Unicorn) from build-deb targets
Upstream-commit: 5ab4b60e119ece418a49ba0c7f70924f766b240d
Component: engine
2015-07-24 15:48:34 -07:00
11ea6871f4 fix memory swappiness lxc
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: a38b544ef082bcea76c4ea13e19d935ac09d3498
Component: engine
2015-07-24 15:46:51 -07:00
9180bba544 #14474 skip DockerSuite.TestRunCapAddCHOWN on lxc
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 0547b5fb2ac98d67eea3ed56f4afae87dff3079c
Component: engine
2015-07-24 15:16:07 -07:00
674470f5c3 Merge pull request #14637 from metalivedev/patch-1
Document that load supports compressed tarballs.
Upstream-commit: 86c7ea48632fd86c692ef763d2113b0971325797
Component: engine
2015-07-24 23:38:43 +02:00
a23b513644 Merge pull request #14522 from carlossg/patch-1
Clarify filters option in list containers doc
Upstream-commit: d951ef128fec53478203163166583f7212956215
Component: engine
2015-07-24 23:13:32 +02:00
08efdea505 Add test for incorrect nonroot passphrase
Fix failing tests for create, push, and pull

Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: eeb6d0a71b754c1c99748f7ba08be27e4d8b8eb9
Component: engine
2015-07-24 14:08:20 -07:00
be6fe06878 Add trust tests for Docker create, run, push, and pull
Created date util function

Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
Upstream-commit: 1406cb35fd814a987b91f92ed1a4b61a21205736
Component: engine
2015-07-24 14:08:20 -07:00
5eae9c3c28 Add more integration tests for trusted push and pull
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: 356b07c89602e4f5e9c9d4c53ec24b341b4e7865
Component: engine
2015-07-24 14:08:20 -07:00
8ea2bd77d3 Add notary integration to docker build
The Dockerfile is rewritten with images references on FROM
instructions resolved to trusted digests. The rewritten Dockerfile
is swapped with the original one during context upload.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 578b1521df85eae8a6205118131751c631323ba5
Component: engine
2015-07-24 14:08:20 -07:00
76e63d676b Refactor api/client/build.go
Separated preparation of context and Dockerfile for
the various different methods of specifying them.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 3021b7a4a0a920c26d87361b6cb8651c110bc4a1
Component: engine
2015-07-24 14:08:20 -07:00
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
eb95ca4553 Merge pull request #14967 from Microsoft/10662-fixpaniconwindowsdaemon
Windows: Fixes panic on daemon binary
Upstream-commit: 2084eee02c49fba22b2396abc626c1e6c7fc8ec2
Component: engine
2015-07-24 16:48:37 -04:00
3ccb4575e6 Merge pull request #14939 from rtrauntvein/docs-autobuild
Fix broken link in automated build doc
Upstream-commit: 2b847df8c2d06f91cb8969eebc3bb861de184c9c
Component: engine
2015-07-24 13:48:14 -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
7ec7d6b833 Remove Ubuntu 14.10 (Utopic Unicorn) from build-deb targets
As of July 23, 2015, it is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2015-July/000198.html) and will receive no further updates.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: a83e4e4a3411be7ae461408bb1c99f2f9af1f5ee
Component: engine
2015-07-24 13:21:01 -07:00
fe5b9c1f61 Windows: Fixes panic on daemon binary
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b405e89d5cd89d132efef1194a815e670ad15554
Component: engine
2015-07-24 12:30:49 -07: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
87314dfb81 Clarify filters option in list containers and list images docs
Based on the list containers with filters options it would seem that filtering containers with label `test=docker-java` could be done with `{"test":["docker-java"]}` which doesn't work

The options that work are `{"label":["test"]}` and `{"label":["test=docker-java"]}`

As seen in https://github.com/docker-java/docker-java/pull/262

Signed-off-by: Carlos Sanchez <carlos@apache.org>
Upstream-commit: 1fb29e6c3c13127912d1de9233f2aaaf63ec0ee8
Component: engine
2015-07-24 11:57:18 +02: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
0e9fea3c70 Remove unnecessary container cleanup in integration-cli
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: bcc0968a2c9b5feef2c09b097c461a80b50ac19a
Component: engine
2015-07-24 14:48:26 +08: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
a375cbd8f0 Fix broken link in automated build doc
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com>
Upstream-commit: 8e66e627d701101e583c31fba419b0ae8cf2fb89
Component: engine
2015-07-23 23:12:06 -07:00