1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

21804 Commits

Author SHA1 Message Date
Jess Frazelle
61116ea963 Merge pull request #18887 from riyazdf/notary-delegations
notary delegation integration into docker
Upstream-commit: 1c979f758753d921ced122dec3953ddbc35ee67f
Component: engine
2016-01-08 10:37:55 -08:00
Alessandro Boch
7467c1af44 Allow user to choose the IP address for the container
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 2bb3fc1bc522059e9be5bd967b6a5c49917f5d0c
Component: engine
2016-01-08 10:09:16 -08:00
David Calavera
219c1dc7e6 Vendor new syslog library with TLS support.
The syslog package in the stdlib is not maintained anymore.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 145f020122681d4868f717d64dfa556db22ac83d
Component: engine
2016-01-08 12:35:35 -05:00
Alessandro Boch
f1d228a431 Vendoring libnetwork
- 49c24217054e269aad3dbfd81ee32780b104dd84

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 19b063e740c8140c70bac65179f944422538babc
Component: engine
2016-01-08 09:19:31 -08:00
Riyaz Faizullabhoy
1ce594cbcd update tests and error messages, revendor notary with tag
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c32a66877f2ddc3f1cce66d78c69e032d6cf795
Component: engine
2016-01-08 09:11:33 -08:00
unclejack
1739126af0 CONTRIBUTING: add guidelines regarding email
This adds guidelines around reaching the maintainers. Emails shouldn't
be sent to maintainers. GitHub mentions should be used instead.

Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 64e8fa9199fb345e017c8ef5299ca69cee01ab4c
Component: engine
2016-01-08 16:49:17 +02:00
Vincent Demeester
c67324aed2 Merge pull request #19180 from coolljt0725/fix_flaky_test
Fix flaky testTestStatsAllNewContainersAdded
Upstream-commit: 3a8d694e01d8c3353f49a3f220ee861769f8b4a5
Component: engine
2016-01-08 13:10:27 +01:00
Antonio Murdaca
68fdf5d8eb Merge pull request #19058 from dnephin/move_opts_to_runconfig_opts
Move some opts validators to runconfig/opts where they are used
Upstream-commit: 018081d5a9acadb218e1284b11b200418aef5e0f
Component: engine
2016-01-08 12:34:49 +01:00
Antonio Murdaca
04c25bef6f Merge pull request #19131 from cpuguy83/fix_plugin_error_handling
Don't error out on plugin err with json
Upstream-commit: f4f848b7a55f142befd13b76803d7d884f815419
Component: engine
2016-01-08 12:22:45 +01:00
Antonio Murdaca
2f9e2cb95f Merge pull request #19179 from estesp/btrfs-userns-perms
Fix btrfs subvolume snapshot dir perms for user namespaces
Upstream-commit: 9e9d7dc8845cfa4bf46d46b8e0b68b16c8c038f7
Component: engine
2016-01-08 12:13:49 +01:00
Lei Jitang
1857956503 Fix flaky test TestStatsAllNewContainersAdded
Wait the new created container for running and then check if it
is in the docker stats to avoid flaky test.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 71d6e71cff4122a987a4655723d50a296916f523
Component: engine
2016-01-08 17:02:08 +08:00
Lei Jitang
6c33dca6bb Make .ensure-syscall-test to use build-arg
.ensure-syscall-test need to build an image, we have
to add http_proxy and https_proxy to make it work.
Inseted of adding http_proxy and https_proxy env to the Dockerfile,
adding a DOCKER_BUILD_ARGS env to pass the build-arg is much more
elegant.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3ff67256132febad4d039845e97db2ad4d55025d
Component: engine
2016-01-08 15:27:21 +08:00
Lei Jitang
b2c99ad7af Create the working directory on container creation
if create a container with -w to specify the working directory and
the directory does not exist in the container rootfs, the directory
will be created until the container start. It make docker export of
a created container and a running container inconsistent.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: cde0ed67a14e3983ba83af8c75434558c865b2bc
Component: engine
2016-01-08 12:11:21 +08:00
Phil Estes
6c383a05bb Fix btrfs subvolume snapshot dir perms for user namespaces
Make sure btrfs mounted subvolumes are owned properly when a remapped
root exists (user namespaces are enabled, for example)

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 72e65e87935e5b82de76a6ef9b8160900f4724b7
Component: engine
2016-01-07 23:05:28 -05:00
cyli
f4511c75b9 Add an integration test for docker being able to push to a repo with delegations.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 1db0c7bb01863f859a193246a0474f9d1b4d6027
Component: engine
2016-01-07 19:35:45 -08:00
Riyaz Faizullabhoy
b741751f8d Notary delegation integration into docker
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c125f50cfce422b19a15e84c5a3940890fb2e23
Component: engine
2016-01-07 19:35:45 -08:00
Jess Frazelle
083a35097b Merge pull request #19173 from calavera/vendor_engine_api_0_1_2
Vendor engine-api 0.1.3
Upstream-commit: 611d5e4eebc4c6153e49a319360df8de5bdd2e7c
Component: engine
2016-01-07 19:19:19 -08:00
Brian Goff
7d383f2b5f On create, copy image data for named volumes.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b4683327074d193428c724b153e8848ef2068c1d
Component: engine
2016-01-07 21:57:08 -05:00
David Calavera
dbccbefa60 Make sure docker api client implements engine-api client.
- Use the master interface in the new repo.
- Use new structures for container create, update and network connect.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: e73ab750edc006324d1019b828c8ec9c551b9717
Component: engine
2016-01-07 21:02:19 -05:00
David Calavera
14985d55be Vendor engine-api 0.1.3.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1feeecf6e58c3690347efed9c0712a698ff426f0
Component: engine
2016-01-07 21:02:19 -05:00
moxiegirl
6ac9b9caaf Merge pull request #19165 from shishir-a412ed/man_page_fix
man page fix: remove -e/--exec-drive=native related description
Upstream-commit: 6213cc9d0476ee43bc92e554f4775e33c3c4d38f
Component: engine
2016-01-07 16:47:07 -08:00
moxiegirl
edc9578a83 Merge pull request #18378 from tonistiigi/content-addressability-storage-docs
Update storage docs for content-addressability
Upstream-commit: b12ef0fe00245ca549be5822d8b26033b59cff7a
Component: engine
2016-01-07 16:44:29 -08:00
Victoria Bialas
72bafe062f added re-directs for cloud install docs as clean-up for #18282
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 2ffb362f9bbfea5ac72ebe11c5692f129eb8ccd2
Component: engine
2016-01-07 16:06:46 -08:00
Avi Miller
8a5de1f3ad Add missing ? to specfile variable.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: c64f9407a4833bcaf34f766378512dd79f47d75f
Component: engine
2016-01-08 11:06:21 +11:00
Anusha Ragunathan
3e753fdd53 Create standard vendor policies.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 1e021ff5715ade80310a04895da414a897529d7a
Component: engine
2016-01-07 15:32:10 -08:00
Jess Frazelle
f22c8d297c Merge pull request #19145 from vdemeester/vendor-my-precious
Add a validate-vendor script
Upstream-commit: d76640d78a1a14b1f7f772c100a95cacfd30248c
Component: engine
2016-01-07 13:53:01 -08:00
Avi Miller
3293844ab5 Restoring the RPM build process for Oracle Linux 6 and updating the docker-engine.spec
file to require the Unbreakable Enterprise Kernel Release 4 on both Oracle Linux 6
and Oracle Linux 7.

The UEK R4 provides the required kernel functionality for VxLAN support
required by Docker 1.9 and user namespace support required for 1.10+.

The build of Docker on Oracle Linux 6 requires some manipulation of the build
environment so that the CGO compiler uses the UEK R4 headers instead of the old
default kernel headers.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 28f52bd06a24705bd6958ac505b6b6f36e877547
Component: engine
2016-01-08 08:09:47 +11:00
Shishir Mahajan
5831ef280d man page fix: remove -e/--exec-drive=native related description
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 50305d66f56774488b6fec2534fd592c263c91e0
Component: engine
2016-01-07 14:21:01 -05:00
Doug Davis
3dff9074e8 Merge pull request #18768 from hqhq/hq_remove_dup_error
Remove redundant error messages
Upstream-commit: ff3b551d2d9c3f955509504b3cfc629c660909cb
Component: engine
2016-01-07 14:13:50 -05:00
Arnaud Porterie
183cea761e Merge pull request #19059 from jfrazelle/seccomp-docs
add syscalls we purposely block to docs
Upstream-commit: cceac7da358c3e25130ce851312c44dd4418c1b2
Component: engine
2016-01-07 11:13:07 -08:00
Brian Goff
20a5900d4d Build names and links at runtime
Don't rely on sqlite db for name registration and linking.
Instead register names and links when the daemon starts to an in-memory
store.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0f9f99500c40f2a46682967ca358cd2346fd5e13
Component: engine
2016-01-07 14:10:42 -05:00
Vincent Demeester
40d1466ce7 Add a validate-vendor script
Makes sure that if ./hack/vendor.sh has been updated, it has been used
to update the vendor folder.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4c22c566e25ff2bc6fa80cd9627c59512a1f768d
Component: engine
2016-01-07 19:57:50 +01:00
Jess Frazelle
6a1af5c70c Merge pull request #19144 from LK4D4/fix_parent_systemd
Choose default-cgroup parent by cgroup driver
Upstream-commit: 938d28e772ec32ed3b09bfb8907852e497990076
Component: engine
2016-01-07 10:24:51 -08:00
Jessica Frazelle
4db7c3289b add syscalls we purposely block to docs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 52f32818df8bad647e4c331878fa44317e724939
Component: engine
2016-01-07 10:22:16 -08:00
moxiegirl
d19e17505e Merge pull request #19156 from HackToday/19152-fix-voldoc
Remove the old reference link
Upstream-commit: 374a9596b22819ddcb1a981ea05a8ba3f4d4f0ed
Component: engine
2016-01-07 09:21:58 -08:00
Alexander Morozov
d9a92e1dc3 Choose default-cgroup parent by cgroup driver
It's "/docker" for cgroupfs and "system.slice" for systemd.

Fix #19140

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: c1cd45d547ef26cf988dc72d456430361dafcf08
Component: engine
2016-01-07 08:56:26 -08:00
Tibor Vass
3ccd6b28f2 Merge pull request #19068 from calavera/vendor_engine_api
Introduce the new engine-api library.
Upstream-commit: 131e2bf12b2e1b3ee31b628a501f96bbb901f479
Component: engine
2016-01-07 11:14:37 -05:00
Sebastiaan van Stijn
67b669c5ee Merge pull request #19160 from thaJeztah/carry-19020-groupadd-docs
(carry 19020) add documentation for groupadd for remote api
Upstream-commit: 6aefa898cb4733888b4b3ffe126ab1ddb9b337fc
Component: engine
2016-01-07 12:41:08 +01:00
Oliver Neal
c4d25ca65c added documentation for groupadd within hostConfig that was added in remote api 1.20
Signed-off-by: Oliver Neal <ItsVeryWindy@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ade71ace7df285795381d1317f8069f14e099bb3
Component: engine
2016-01-07 12:30:27 +01:00
Kai Qiang Wu(Kennan)
33bcd44d7d Remove the old reference link
Fixes: #19152

As issue #14214 closed, so this old link is not needed.
We can remove it now.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: ca7b69016a13739db74eb09046d8344762a2caa4
Component: engine
2016-01-07 10:23:36 +00:00
Sebastiaan van Stijn
25ac09e895 Merge pull request #19090 from thaJeztah/fix-api-markdown
fix markdown and typos in API docs
Upstream-commit: 3442339b98dccc7137ea8d49393eff44166a67ec
Component: engine
2016-01-07 08:32:01 +01:00
moxiegirl
3e3964af2f Merge pull request #19115 from cpuguy83/volume_plugin_docs_change.md
Add docs for volume plugin ls/get
Upstream-commit: af6c6dbf8748b0e09d48a788cb17cb6d3c30c7a4
Component: engine
2016-01-06 20:04:09 -08:00
moxiegirl
e1187bdd34 Merge pull request #19127 from thaJeztah/use-the-f-luke
Add -f flag to cURL install instructions
Upstream-commit: dd2981c26dba1f6d87a2099b886c87aec259031d
Component: engine
2016-01-06 20:02:53 -08:00
Zhang Wei
2e84a27cb3 Check nil Terminal to avoid panic
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 7f0d304f3767d4f33d23480a3ca2f54bb72938b7
Component: engine
2016-01-07 10:07:12 +08:00
David Calavera
6ca1360018 Remove types and lib packages from the engine.
They live in github.com/docker/engine-api now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c7d811c8161b1acc677b15f56b02c773824dfb87
Component: engine
2016-01-06 19:49:00 -05:00
David Calavera
4ec2693c9e Modify import paths to point to the new engine-api package.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 907407d0b2e5863f0e1b40b93a356bbf03c7b9fb
Component: engine
2016-01-06 19:48:59 -05:00
David Calavera
e49de6ef58 Vendor engine-api project.
Use latest tag for both, engine-api and go-connections.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9927e712c0c5a04c2d802e160e27d3c16c650cf2
Component: engine
2016-01-06 19:46:06 -05:00
John Howard
30a8d72704 Windows: Fix security warning regression
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ebf4c917170215663157f028798e0244040b6be3
Component: engine
2016-01-06 15:54:43 -08:00
Tibor Vass
d39715c705 Merge pull request #19099 from calavera/replace_docker_only_trust_enabled
Do not perform build context switch when content trust is not enabled.
Upstream-commit: 7fab93175d605f98cddf811819d9ab081bb4f90e
Component: engine
2016-01-06 18:09:30 -05:00
David Calavera
f720f8755b Merge pull request #19110 from brahmaroutu/update_openc
update runc to the latest code base to fix gccgo builds
Upstream-commit: 4ee3048fa8382f9e9af2418029b8e53885bb906a
Component: engine
2016-01-06 15:09:11 -08:00