d4728ca93c
Merge pull request #15007 from cles/arch-systemd-network-issue
...
Add arch install docs warning about systemd-network
Upstream-commit: 6c0c6b120ac4ea05301b584c3b84f7e875f542e6
Component: engine
2015-07-27 09:22:01 -07:00
264f05bb5c
Merge pull request #14987 from vdemeester/fix-cli-import-docs
...
Add missing documentation to cli/import.md
Upstream-commit: a65f7acbbf5e543c9389ff0497eb966fefc00f1d
Component: engine
2015-07-27 09:19:57 -07:00
74ff66528e
Merge pull request #14992 from runcom/remove-unused-funcs
...
Remove unused functions
Upstream-commit: 39999edcc9c966b07f9f1826e5beef767b725a2f
Component: engine
2015-07-26 18:36:37 -07:00
defa38f468
Merge pull request #14998 from jfrazelle/fix-systemd-debs
...
fix deb packaging systemd files
Upstream-commit: 23b0fdc896fe300c3a63810f604ef3966560720a
Component: engine
2015-07-26 17:49:19 -07:00
b39a60e323
much improved wording for manual network config setup on arch install docs by @moxiegirl
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
Upstream-commit: 26fa9b0d0d23700ba87aba7862fcf2baa5c26f1e
Component: engine
2015-07-26 19:11:27 +02:00
1e7a75140d
Add missing documentation to cli/import.md
...
PR #11907 added support for import using file (path), but it missed
the update of cli/import.md. This fixes that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3101941120db54dde89933d76d3ea23c4bde0f7c
Component: engine
2015-07-26 18:39:42 +02:00
82c4b22380
Merge pull request #15012 from johnktims/patch-3
...
Fix typo
Upstream-commit: 77adf6abf12007659bf2eae526fb2b864c487efe
Component: engine
2015-07-26 11:04:17 -04:00
624235bebb
Fix typo
...
Signed-off-by: John Tims <john.k.tims@gmail.com >
Upstream-commit: 7b552c7a3782d2cb8270c5c3ca05d7b34b1ea407
Component: engine
2015-07-26 10:53:07 -04:00
0560ee0b45
Change of wording, rearrange section ordering
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
Upstream-commit: e1b57b2a87a763fc9fac5fbd59f64dcf1e541e7e
Component: engine
2015-07-26 13:27:35 +02:00
a41b93c9fb
Add arch install docs warning about systemd-network
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
Upstream-commit: 6bd15a68cf59043e05bd69fccbafcfed25d7c22e
Component: engine
2015-07-26 13:27:07 +02:00
29208c0bdb
Merge pull request #15004 from charleswhchan/patch-2
...
Update faq.md
Upstream-commit: 5297a25b4eabb0bd6b76a09ea8f63d3e18329243
Component: engine
2015-07-26 13:03:45 +02:00
9f25c64664
Merge pull request #15006 from czerasz/patch-1
...
Fix typo in JSON config example, in the CLI documetation
Upstream-commit: a059701fa584295ea213c2ee50073d77e73704e7
Component: engine
2015-07-26 12:56:38 +02:00
10ca606a3c
Fix typo in JSON config example, in the CLI documetation
...
Signed-off-by: Michał Czeraszkiewicz <czerasz.hosting@gmail.com >
Upstream-commit: 09a9958e22640e1bcfec1c0c274a8c42ebc88b4a
Component: engine
2015-07-26 12:09:31 +02:00
6591e5b614
Update faq.md
...
Fix case for PostgreSQL.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: c6816dfc677a639361320274760d956eea200a29
Component: engine
2015-07-25 22:03:20 -07:00
f12a258842
Merge pull request #14996 from chrisseto/master
...
Fix go vet errors
Upstream-commit: b04dd6b7bc1fab74fd5854ae8aef3224fca9a178
Component: engine
2015-07-25 19:20:48 -07:00
3ff45b92dd
Merge pull request #14940 from coolljt0725/add_vxfs_magic_number
...
Add VxFS magic number, fixes #14847
Upstream-commit: 6b2b6cb3fc1a047e701b7884d98c89338144fb0a
Component: engine
2015-07-25 23:25:48 +02:00
b1920b91e3
fix deb packaging systemd files
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: a2ea8f2ad8b93c53253b9c86537dad95e14bd599
Component: engine
2015-07-25 14:04:39 -07:00
861b01ab9e
Fix go vet errors
...
Signed-off-by: Chris Seto <chriskseto@gmail.com >
Upstream-commit: 04f76b67c9f0a4559ef91e24873f51b81c81b957
Component: engine
2015-07-25 17:00:10 -04:00
441679c8ee
Merge pull request #14245 from gs11/master
...
Clarifications in usage
Upstream-commit: 2d61de4625b17badb2e380d8142ff99fda5d22cd
Component: engine
2015-07-25 22:48:48 +02:00
869b9fcdec
Remove unused functions
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 0e69318b27e06d25e1d02736ab8c598547d8113a
Component: engine
2015-07-25 19:54:05 +02:00
f26f8b4a2b
Clarify error message when container name is already in use. Signed-off-by: Gustav Sinder <gustav.sinder@gmail.com>
...
Signed-off-by: gs11 <gustav.sinder@gmail.com >
Upstream-commit: 547d6c6656f161c3ad60c85ac0f19cf3d80571c7
Component: engine
2015-07-25 14:08:38 +02:00
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
