Commit Graph
13675 Commits
Author SHA1 Message Date
Jessie Frazelle 20b7c132ab Merge pull request #11278 from ahmetalpbalkan/win-cli/fakeGIT
integ-cli: use httpserver container for fakeGIT
Upstream-commit: 52f6da223839a5ac1fc003b259b74f6a02fc2858
Component: engine
2015-03-11 18:19:11 -07:00
Michael Crosby 282d3dadfd Merge pull request #11331 from jfrazelle/update-logrus
Update logrus to 0.6.6
Upstream-commit: 5494432f917eb0f6e4cf73deed366f6830ec64ec
Component: engine
2015-03-11 16:18:22 -07:00
moxiegirl 69e2749ca8 Merge pull request #11248 from Finkes/patch-1
improve Debian installation instructions
Upstream-commit: 254b6f8946dd7cceaa32d5e1da981287ace5f0f5
Component: engine
2015-03-11 15:36:01 -07:00
moxiegirl e0e2bdc16b Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated
docs: --api-enable-cors is deprecated,updated docs description
Upstream-commit: cc4095a18cfff27dfca77251978b6a9bdaa5c86a
Component: engine
2015-03-11 15:28:28 -07:00
moxiegirl 10a769231a Merge pull request #11329 from estesp/fix-run-test-doc
Remove escaping from TESTFLAGS; it is no longer required
Upstream-commit: 5b5b09275e47d3b2a91eef0122865388dc7774a8
Component: engine
2015-03-11 15:01:17 -07:00
moxiegirl 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
moxiegirl 61eb7821e7 Merge pull request #11311 from delftswa2014/11309-add-filter-name
Adds 'name' filter to the CLI reference.
Upstream-commit: f960a79b7c0be371697f914fc8b2e270c73cc974
Component: engine
2015-03-11 14:54:51 -07:00
Tibor Vass 54029ad909 Merge pull request #11310 from ahmetalpbalkan/win-cli/ping-icmp
integ-cli: remove ICMP dependency from test, use nslookup
Upstream-commit: d6a6c7d4d9ef08d218cad6dd9ed72b3d2f40060c
Component: engine
2015-03-11 17:53:50 -04:00
Ahmet Alp Balkan 4ae0ae0aee integ-cli: remove ICMP dependency from test, use nslookup
As we started running CI machines on Azure cloud and Azure
doesn't have ICMP stack implemented by replacing
`ping 8.8.8.8` with `nslookup google.com`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 004ac85aa25f08e350465140ee7404ad31602d75
Component: engine
2015-03-11 14:27:11 -07:00
Jessie Frazelle 31b9b2a976 Merge pull request #11326 from cpuguy83/11315_rename_w_daemon_restart
Persist container to disk after rename
Upstream-commit: c6321931d234a190bf0696d0ab5711425c83480c
Component: engine
2015-03-11 13:44:13 -07:00
Jessie Frazelle 6f4d9f063b Merge pull request #11330 from ahmetalpbalkan/win-cli/events-daemon-time
integ-cli: Fix clock skew against remote test daemon
Upstream-commit: bf35122890016d4bac4d3b89657d7f0c46a9838e
Component: engine
2015-03-11 13:40:37 -07:00
Jessie Frazelle 8e9f76e225 Merge pull request #11333 from crosbymichael/upldate-libcontainer-mar-11
Update libcontainer to aa10040b570386c1ae311c6245b
Upstream-commit: 586f75d61c6f6b5d9bc9b4096c391b9ce0b2e58f
Component: engine
2015-03-11 13:04:51 -07:00
Brian Goff e7e0b4ff1a Persist container to disk after rename
Fixes #11315

After rename occured the graphdb was updated but the container struct
was never commited back to disk, so on daemon restart it loads the old
name again.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c5c72cf151b21482b2f27417322342c6d781108c
Component: engine
2015-03-11 12:39:31 -07:00
Dominik Finkbeiner 1d54ba03b3 improve Debian installation instructions
Signed-off-by: Dominik Finkbeiner <finkes93@gmail.com>
Upstream-commit: cddb443da428c0b9c9f4f5910a36f478110db224
Component: engine
2015-03-11 20:14:32 +01:00
Michael Crosby 447782f74b Update libcontainer to aa10040b570386c1ae311c6245b
Includes mqueue label fix and cgroups improvements.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: c553be5a4f3ff24079337e2ffe2437325f9969e1
Component: engine
2015-03-11 11:49:15 -07:00
Jessica Frazelle e4aa3231a3 Update logrus to 0.6.6
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 89e2e5fc55620634df3f2c9403594b0f701b0c5c
Component: engine
2015-03-11 11:29:13 -07:00
Ahmet Alp Balkan 76ab368c1d integ-cli: fix clock skew against remote test daemon
This fixes the `docker events`-related tests as they have been
failing due to clock skew between CI machine and test daemon on
some other machine (even 1-2 seconds of diff causes races as
we pass local time to --since/--until).

If we're running in same host, we keep using time.Now(), otherwise
we read the system time of the daemon from `/info` endpoint.

Fixes pretty much all events-related tests on windows CI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e424c54d9c4030dc3290701e8e76add372e09e08
Component: engine
2015-03-11 10:28:56 -07:00
Phil Estes d6ac6e4561 Remove escaping from TESTFLAGS; it is no longer required
In fact, it doesn't work as the bare `\` backslashes are now preserved
and therefore are not valid regex matches on any test, making it not run
any tests at all.  I assume at some point there was a process in the
pipeline that needed escaping, but on master (for quite a while) this
has not worked.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ed3f3835071496e9314d0e2a1806ac43f304decc
Component: engine
2015-03-11 13:09:40 -04:00
moxiegirl 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
Doug Davis 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
Tibor Vass b582bfa2e6 Merge pull request #11317 from zenlinTechnofreak/helpSuffixSpace
Help suffix space
Upstream-commit: 830544044edff87980a176d8984c1288822755cc
Component: engine
2015-03-11 10:04:23 -04:00
Tibor Vass 6cc0f5d3a1 Merge pull request #11316 from ahmetalpbalkan/win-cli/help-homepath-fix
Make use of %USERPROFILE% in cli help message
Upstream-commit: 1a5e46ce8957149d45eb8792254625ae696c8e4e
Component: engine
2015-03-11 09:28:43 -04:00
Zen Lin(Zhinan Lin) 8ea0c3c94e Add checking trailing space for all lines of the help output
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 491b63e0daa9103cf9471c03c4b41026f6955323
Component: engine
2015-03-11 21:24:30 +08:00
Phil Estes cb89c142a6 Merge pull request #11244 from ChristopherBiscardi/docs-code-fixes
Fix a few code rendering errors in docs
Upstream-commit: 95dcb2748442fc1f59e8c2e010679e0aea3cef1c
Component: engine
2015-03-11 08:34:53 -04:00
Zen Lin(Zhinan Lin) 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
Zen Lin(Zhinan Lin) 8855da6111 Add the check for suffix of option in each line of help, to make sure no extra space in it
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: f63a29ddeee62c8e4fcb1cf8eaf84aff305380c0
Component: engine
2015-03-11 18:46:01 +08:00
Ahmet Alp Balkan b147bc8ddc Make use of %USERPROFILE% in cli help message
An earlier commit was causing docker windows CLI build to not to pick up
the shorthand form for home directory (`%USERPROFILE%`) shown in when
`docker --help` is executed.

Fixing that bug and making the if statement concise and clear.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 802c90500073ad79e5a6520402ef2a7268c824b7
Component: engine
2015-03-11 02:14:49 -07:00
Rick Wieman dbea27ac5e Adds 'name' filter to the CLI reference.
Also sorts the filter and fixes the bullet list.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 179e45f27c5e6d526d4082296bba563705195755
Component: engine
2015-03-11 07:41:56 +01:00
Ahmet Alp Balkan 546ad5a411 integ-cli: use httpserver container for fakeGIT
This change enables `fakeGIT()` to use the new `fakeStorage`
server which is automatically starting a container on the remote test
daemon machine using the git repo directory (when requested).

Fixes the following tests:

- `TestBuildApiLowerDockerfile`
- `TestBuildApiBuildGitWithF`
- `TestBuildApiDoubleDockerfile` (skipped on windows: NTFS case-insensitive)
- `TestBuildFromGIT` (still needs local server)

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 44ffb199d03f0d63a2c9ad05e9fd03a6a08c594d
Component: engine
2015-03-10 22:48:35 -07:00
moxiegirl e5672966b5 Merge pull request #11307 from moxiegirl/fix-contributors-logo
Fixing broken image thanks @SvenDowideit 
Upstream-commit: 558c3b09db41a26d77dae831f4d55ee6947a60e5
Component: engine
2015-03-10 22:48:10 -07:00
moxiegirl 0cbd226ff4 Merge pull request #10663 from brahmaroutu/events_filterbyname_10645
filter events by container name
Upstream-commit: dd6f76a76cb4e12d74fcd974ebd6a9c4f8d43751
Component: engine
2015-03-10 21:16:39 -07:00
moxiegirl ac7c4b8d71 Merge pull request #11306 from x1022as/master
Fix minor typo
Upstream-commit: a58f0d47f364ab8e21c6ef42d3fc586f858b3566
Component: engine
2015-03-10 20:55:37 -07:00
Mary Anthony 8e14872373 Fixing broken image
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: add13cb7827aace3a14d0ec251d6d5d41a0a6489
Component: engine
2015-03-10 20:47:06 -07:00
Mabin 28a7abbf0e docs: api-enable-cors is deprecated,updated docs description
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 0648e59ad85e676f8e0a02156ea5e79a6e106267
Component: engine
2015-03-11 11:38:37 +08:00
moxiegirl 70c93c9f6d Merge pull request #11263 from moxiegirl/edit-ilo-new-contribguide
Updating to account for new contributors guide.
Upstream-commit: c3c29284ae677ef0b48601d6d3934d1cd4112228
Component: engine
2015-03-10 20:36:51 -07:00
Deng Guangxing b951eb79db Fix minor typo
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: ce1a0b612d300210fadf12556e1b38885f098197
Component: engine
2015-03-11 11:13:39 +08:00
ChristoperBiscardi 6148a6ae03 Modify ip_forward instructions
Signed-off-by: ChristoperBiscardi <chris@docker.com>
Upstream-commit: 4ab18fa2ac119c26516f2156dabda9dd0a781301
Component: engine
2015-03-10 19:28:55 -07:00
Michael Crosby 365bb5f91c Merge pull request #10853 from rhatdan/audit_read
Need to support new linux capability AUDIT_READ
Upstream-commit: 2772a475199b4503212d7d02aa675aa4faed7304
Component: engine
2015-03-10 17:28:50 -07:00
Dan Walsh 8c914c9a0f Need to support new linux capability AUDIT_READ
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 72f366238f443f7cbbf4ada76bd5ab4b36495251
Component: engine
2015-03-10 20:01:06 -04:00
Ahmet Alp Balkan 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
Mary Anthony fbeafd00f2 Updating to account for new contributors guide.
Primary links will go to the contributor's guide
Adding in Fred's comments
Tweak list alignment

Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: 933f207fd8d413e6ba7fef283a0bf5bcfd923e9f
Component: engine
2015-03-10 13:30:46 -07:00
Alexander Morozov f7f0283220 Merge pull request #11292 from jfrazelle/cleanup-defer
cleanup defer func
Upstream-commit: 13bfbfc84bd63fd2014bc6590a8a568c0560d5f8
Component: engine
2015-03-10 12:46:16 -07:00
Jessica Frazelle ecba3551ba cleanup defer func
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: 17a784aa092fe2ccb6463e4e4d5e0ff5279b4efa
Component: engine
2015-03-10 12:18:43 -07:00
Jessie Frazelle d3dac115e9 Merge pull request #11211 from cpuguy83/ensure_engine_shutdown
Ensure clean engine shutdown on startup errors
Upstream-commit: e4b753c1de558a07a8a079b39013677211badbd7
Component: engine
2015-03-10 12:13:35 -07:00
Jessie Frazelle 993f8d5799 Merge pull request #11235 from coolljt0725/fix_default_restart_name
Set default restart policy name to `no` Closes #10874
Upstream-commit: 7e47bb6effd1f076a78827543c4b4ce399c0ad1b
Component: engine
2015-03-10 12:12:40 -07:00
Jessie Frazelle 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
Phil Estes 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
Tibor Vass e719045448 Merge pull request #11287 from rhatdan/homedir
If $HOME is not set, return homedir from /etc/passwd
Upstream-commit: d26e3cfd52d4041f2befbadcdffbfd0a9202a925
Component: engine
2015-03-10 14:38:30 -04:00
Michael Crosby 7342ab6e3e Merge pull request #11267 from thaJeztah/simplify-parser_test
cleanup: simplify parser_test
Upstream-commit: 7dac3f417d958e96c9c8277a74844e12a6c94367
Component: engine
2015-03-10 11:05:39 -07:00
Michael Crosby 07940fe2c8 Merge pull request #11277 from chenhanxiao/RELEASE-CHECKLIST-typo
RELEASE-CHECKLIST: fix a typo
Upstream-commit: ec7621aab566138dbb473c4963568b93f010aaaa
Component: engine
2015-03-10 10:50:34 -07:00