Commit Graph

601 Commits

Author SHA1 Message Date
2ae56c859a Merge pull request #11679 from avidas/api-common-constants-document
Add comments to api/common constants
Upstream-commit: 73dab8205a77320d728d5d77880b2e1109d07a67
Component: engine
2015-03-24 14:43:09 -07:00
4e35bd8884 Merge pull request #11710 from runcom/11599-refactor-pkg-common
Refactor pkg/common, Fixes #11599
Upstream-commit: 8eee55a35c8161bde7bee50231b67f8e33dd16e0
Component: engine
2015-03-24 11:45:07 -07:00
1e47557825 Refactor pkg/common, Fixes #11599
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: b80fae735684406d848b16a0f148a746e17ed25f
Component: engine
2015-03-24 18:19:59 +01:00
287b673e43 Return AuthResponse from postAuth api endpoint, Fixes #11607
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: babd1b3e1fd7be7674f6e96f264b1b841aeba3b9
Component: engine
2015-03-24 09:57:01 +01:00
d3b04844fa Add comments to api/common constants, closes #11583
Signed-off-by: Avi Das <andas222@gmail.com>
Upstream-commit: c136591f40c34de51bbb0691ae69f393ff8b2f0e
Component: engine
2015-03-23 22:35:41 -05:00
bb8cd4ea0b Merge pull request #11665 from runcom/11613-api-exec-start-structured-response
Return ContainerExecCreateResponse from container exec create API endpoint
Upstream-commit: e6b7d9307269973d3dc8ff53cff4e141c47c671e
Component: engine
2015-03-23 17:52:15 -07:00
7074731d32 Merge pull request #11636 from robertabbott/refactor_networkfs
Refactor pkg/networkfs
Upstream-commit: d5eea4e8b04074b709d1bbe19b5336504df44446
Component: engine
2015-03-23 16:58:29 -07:00
a82b5988e8 Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 0c3d2f6f9658ae9b1e7c7cc6f7fda730d4b04898
Component: engine
2015-03-24 00:41:54 +01:00
d10460e7af Merge pull request #11570 from runcom/9658-consistent-autoremove
Remove container if --rm flag is passed and container cannot be started
Upstream-commit: 197a3f0a98bbedc1253df3fae42837769871beb1
Component: engine
2015-03-23 15:38:51 -07:00
2ed910fd38 Merge pull request #11406 from MabinGo/CmdStart_fix
Fix hanging up problem when start and attach multiple containers at once
Upstream-commit: bd952021613b26b7d8b8d078adda72d9ff6def00
Component: engine
2015-03-23 10:17:50 -07:00
2d5a6d9e9b Remove container if --rm flag is passed and container cannot be started
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: d124197cc726a3b69cc3cde8c4d560f3f0e1af9c
Component: engine
2015-03-23 13:03:31 +01:00
4b8e196164 Refactor pkg/networkfs
Solves #11591

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: a91b2431a303f919b0737d95639d8e445124cb23
Component: engine
2015-03-22 23:53:47 -07:00
a1d0fa6752 Fix hanging up problem when start and attach multiple containers
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 7dc1af146d24c346ac74c9dcb1df98f9ef51339d
Component: engine
2015-03-23 12:10:22 +08:00
088f0e2cb3 Merge pull request #9774 from pwaller/cancellation
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
2015-03-22 19:16:23 -07:00
bac420baa9 Merge pull request #11566 from tiborvass/carry-10864
Carry 10864: ANSI terminal emulation for windows
Upstream-commit: e09ead98ef41d14d7e3d8784a0edf29d4afd60f5
Component: engine
2015-03-22 18:21:32 -07:00
7c1bfa9093 Implement build cancellation
Add the capability to cancel the build by disconnecting the client.

This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.

This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.

* Add documentation of cancellation to cli and API

* Protect job cancellation with sync.Once

* Add TestBuildCancelationKillsSleep

* Add test case for build cancellation of RUN statements.

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: 671c12204cb469d868f646da1474d5bad6541770
Component: engine
2015-03-22 11:31:28 +00:00
632e09a6f3 Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning
Add cli build warning about chmod bits on windows
Upstream-commit: c536e5bfb4e8f501ec27a9cc6d55b64d8f1a1603
Component: engine
2015-03-20 19:19:38 -04:00
638765fe3b Add cli build warning about chmod bits on windows
This shows a warning message about adjusted file/directory permission bits
when the `docker build` cli command is executed on windows.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 4a8b3cad6096854027151dfbcfb4b2cd8841ad95
Component: engine
2015-03-20 20:13:32 +00:00
449ca606a0 Add integration test for unix sock cleanup
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 16309bef6395a50ee2871780b81caed8bc6c498e
Component: engine
2015-03-20 12:34:35 -04:00
e274da0bb7 Implement cleanup unix sockets after serving.
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
Upstream-commit: 0c0e9836c4bed0190718b0ddd0028790b19c200c
Component: engine
2015-03-20 09:12:59 -04:00
793cdf14d1 Merge pull request #11410 from cpuguy83/10191_build_resources
Allow setting resource constraints for build
Upstream-commit: 2cde817458a6ff3d371406cf226552fbd4fd3de9
Component: engine
2015-03-18 21:44:21 -04:00
5e80a64076 Allow setting resource constrains for build
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e6ae89a45a699bd44f03517396777e34ec76018b
Component: engine
2015-03-18 20:57:13 -04:00
47d9382364 Merge pull request #11430 from jfrazelle/export_outputflag
Modified `docker export` to allow an --output flag
Upstream-commit: 8ec4e698395fb18ed6a6ec1f17798bc05230f0fa
Component: engine
2015-03-18 19:04:43 -04:00
803adf7842 Merge pull request #11464 from ncdc/fix-duplicate-dangling-images
Fix duplicate display of dangling images
Upstream-commit: 29f809233e58547389da040859a8c286288c4d8a
Component: engine
2015-03-18 13:53:33 -07:00
ea8c209cf2 Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144
Clarify behavior of docker cp
Upstream-commit: 50bf3cbedc923985868bd84515460aad174dcccb
Component: engine
2015-03-18 08:46:52 -07:00
f8293aa682 Fix duplicate display of dangling images
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: c680dd9e5adfe7255ac4499bff26bbb6edf7fe78
Component: engine
2015-03-18 10:41:01 -04:00
90fc12f567 Merge pull request #10568 from LK4D4/logging_drivers
Logging drivers
Upstream-commit: 1ff5a91007f01d2d61a7b2066db2e164085f0d1b
Component: engine
2015-03-17 09:45:58 -07:00
d6d379e87a Add ability to refer to image by name + digest
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: a2b0c9778feac970524b98ef7a91b5528fdeb9d5
Component: engine
2015-03-17 10:10:42 +00:00
c16863b9b6 Modified docker export to allow an --output flag
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added an --output flag to docker export and created tests.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added text to reflect a new output option for the export command.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Whitespace clean up

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added man page documentation for the new --output flag in export

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Upstream-commit: 5ff122f79713f177c07dbc43bb81f991243472d5
Component: engine
2015-03-17 00:20:19 -07:00
7a404617a3 Merge pull request #11402 from miminar/err-cleanup
Error formatting cleanups
Upstream-commit: 88f437d6c619f7b07a22cb5750814bce4d8d7164
Component: engine
2015-03-16 16:13:16 -07:00
1902f8ca99 Merge pull request #11300 from Microsoft/10662_jjh_server_factor_serverfd_and_systemd_for_windows
Factor out ServeFD & systemd in server for Linux only (Not Windows)
Upstream-commit: 66bf7a269a29c1058384727ec852024198a5db77
Component: engine
2015-03-16 14:12:48 -07:00
6c2adcb2c5 Use syscall consts, check for errors,
Also rename func for non-windows specific names.

Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
Upstream-commit: 45262c4cb057e78ba98d02b5e0121ed402779c7f
Component: engine
2015-03-16 14:04:56 -07:00
78e67ff2df ANSI terminal emulation for windows
It is implemented by intercepting and interpreting the output
escape sequence by calling win32 console apis.

In addition the input from win32 console is translated to linux keycodes

Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
Upstream-commit: d8c3090dd9abe3f0d95f99c9d8c7660922e9a719
Component: engine
2015-03-16 14:04:49 -07:00
2479608ad5 Merge pull request #10977 from robertabbott/10959-progressreader
Moves progressreader from utils to its own package
Upstream-commit: 8ae20d8eba127361bc07260580e2d3b8e3628c3e
Component: engine
2015-03-16 12:45:33 -07:00
86b5fcf410 Clarify behavior of docker cp
The STDOUT behavior of cp is not yet released in 1.50 so removed.
Also, tested against 1.5 all other behaviors and extended documentation to match.
Renamed HOSTPATH to HOSTDIR to give a self documenting name.

Adding back in the references to STDOUT
fix the command string
Entering Doug's comment re append and ~/tmp/foo in the glass
Adding in Doug's comments regarding PATHs and missing |-
Updating with James comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 9a78ed8f48f2d1404c4fadcb6116ffd46cd335f5
Component: engine
2015-03-16 12:44:28 -07:00
c29e43cc4b Format error by value
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 210ab030bc3dab7bcf8f7252f2f9facb5a26cb6b
Component: engine
2015-03-16 12:05:53 +01:00
9bd1fc5995 Correctly check that gid parses as an int
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 8ef79ae8e42ae020a373712bd7d08bcb81e3fa97
Component: engine
2015-03-14 23:02:53 +00:00
9010aeaadf Fail docker logs on all logging drivers apart from 'json-file'
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bdf3a0295d401624483d4103fdaacc2bea1c7d46
Component: engine
2015-03-13 15:02:09 -07:00
b9f12f801a Allow a non-existent groupid to own the docker socket
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 334382a8c31285689f0b060de81b8f631d928970
Component: engine
2015-03-13 18:12:50 +00:00
0b6f77080d Merge pull request #10620 from acbodine/notify_user_of_creds_save
Adds: notify user of login credential persistence for registry
Upstream-commit: e781c9624cb3b646fde1501d95d15933eedadf1e
Component: engine
2015-03-12 13:43:20 -07:00
018c3380f4 Merge pull request #11325 from duglin/11289-HelpDashF
Minor tweak to build -f text to make it clear Dockerfile is in context
Upstream-commit: 24408f1c18790bf607452108943b3e18cbb61f38
Component: engine
2015-03-11 14:58:38 -07:00
424b1cdcc8 Merge pull request #11291 from ahmetalpbalkan/info/system-date
Add system time to /info
Upstream-commit: d010bf0d994ce562a3be693f6afef71d55bea887
Component: engine
2015-03-11 09:43:43 -07:00
45e612ea59 Minor tweak to build -f text to make it clear Dockerfile is in context
Closes #11289

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1b46248a332dab1a886d9c4352f9e0057e6c284f
Component: engine
2015-03-11 09:04:30 -07:00
362dc0b239 Normalize the log for docker subcommand usage,
delete unecessary blank after "[OPTIONS] "
and add a blank to the log between options and signature.

To make the code style consistency.

Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 2b051bcbda06ec48287e75da506bacf95be2b652
Component: engine
2015-03-11 18:58:32 +08:00
6283bdf158 Remove import to utils in progressreader
Added method in StreamFormatter to handle calls
from progressreader. Solves #10959

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 12b278d3540bc32699e8c2197b556188fd98b77b
Component: engine
2015-03-11 00:50:27 -07:00
f486128375 Add system time to /info
This change adds daemon's system time as RFC3339Nano to the `/info` endpoint
and shows in a more readable format (UnixDate) in `docker -D info` output.

I will be using this to fix the clock skew between the remote test host and
the CI machines running `docker events`-related tests as they're using `--since`
and `--until` and the timestamps are not matching when daemon is not on the
same machine.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2977fd2b7aed42008ca2ad90dcd8fec5ead4e86b
Component: engine
2015-03-10 15:29:05 -07:00
806995e9fe Factor out ServeFD & systemd in server for Linux only (Not Windows)
Signed-off-by: John Howard <John.Howard@microsoft.com>
Upstream-commit: 081c6c76e2e9924159e1d320525048e4657a9e74
Component: engine
2015-03-10 15:06:16 -07:00
e6f3051dc3 Merge pull request #11288 from estesp/warn-on-localhost-dns
Add warning for --dns flag set to localhost addresses.
Upstream-commit: 8be1671f451079b3567689c19ccc310266d026cd
Component: engine
2015-03-10 12:03:46 -07:00
53af0dd72f Add warning for --dns flag set to localhost addresses.
We should warn users who use the `--dns` command line option to point
DNS to a localhost address, either IPv4 or IPv6.  Unless they have
specifically set up the container as a DNS server or are using
--net=host (which is why this should be allowed, but warned on because
those are pretty unique cases) a localhost address as a resolver will
not reach what they might expect (e.g. expecting it will hit localhost
on the Docker daemon/host).

Added a test for the message, and fixed up tests to separate stdout and
stderr that were using `--dns=127.0.0.1` to test the options.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: afa92a9af0f1a77ef25aab73b11aa855a1823666
Component: engine
2015-03-10 14:43:17 -04:00
31e0dffb09 Merge pull request #11258 from HuKeping/cmdlogin
Remove leading spaces of username when login
Upstream-commit: aa19a78d3dacc5e774085933b897a01dd78e71d0
Component: engine
2015-03-09 19:02:24 -04:00