1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

13691 Commits

Author SHA1 Message Date
Doug Davis
8ab6b4e2b5 Merge pull request #11359 from sunyuan3/m1
correct some daemon spelling mistakes
Upstream-commit: 4e7bf0dde4ac6707b24733a8e65da1ca10c40162
Component: engine
2015-03-12 22:17:19 -04:00
Yuan Sun
e70ef80162 correct some daemon spelling mistakes
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 906974b185b431a8c493479f748677f3c0bc4ca3
Component: engine
2015-03-13 05:14:56 -04:00
Jessie Frazelle
b6672fca8d Merge pull request #11351 from tianon/bash-3-frozen
Update "download-frozen-image.sh" with Bash 3 support for msysGit
Upstream-commit: 50c6c675e666d2e17a961b40a82306219053c2a1
Component: engine
2015-03-12 18:05:11 -07:00
Michael Crosby
266f46c668 Merge pull request #11340 from fredlf/docs-lgtms
Adds Fred, updates docs LGTMs
Upstream-commit: eb435d70c138c842c238b4513c3c63cb7547c030
Component: engine
2015-03-12 14:35:23 -07:00
moxiegirl
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
Alexander Morozov
b4071d7043 Merge pull request #10924 from tcnghia/master
engine.Tail() to ignore trailing whitespaces.
Upstream-commit: 227f60ce76a0b73ea0b6534cab34dd7ae777a6f6
Component: engine
2015-03-12 12:55:48 -07:00
Tianon Gravi
fd3cd22156 Update "download-frozen-image.sh" with Bash 3 support for msysGit
This uses a bit of on-disk state in our export directory to emulate our associative array for generating the "repositories" JSON file.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 27aab3acc6b38ddc39d19e16d61d47f0a4436350
Component: engine
2015-03-12 12:32:16 -06:00
Tibor Vass
7f7a47b98e Merge pull request #11265 from duglin/ScratchSHfix
Fix builder when num of RUN args is 1
Upstream-commit: 565cff84b1ae13e21fa74af83e58d29bafbca47a
Component: engine
2015-03-12 09:30:56 -05:00
Phil Estes
10fceb4fae Merge pull request #11269 from tianon/update-simple
Update Dockerfile.simple to include aufs-tools
Upstream-commit: 5d174e000f9e0d0d4d557367ab7685834d190a71
Component: engine
2015-03-12 10:05:56 -04:00
Brian Goff
3ac5e5187d Merge pull request #11342 from sunyuan3/spellingmistake
correct a spelling mistake
Upstream-commit: d9c6787b4aa00db33b0f607dc67f1a83565f5269
Component: engine
2015-03-12 05:54:49 -07:00
Yuan Sun
182d2d03b5 correct a spelling mistake
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: a02256577ab0806f004e41fd94aaaed52d1aff97
Component: engine
2015-03-12 09:22:51 -04:00
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
Fred Lifton
2fb233b0f3 Adds Fred to list of people and clarifies that docs approval requires only two LGTMS (not a "majority" as it was before Mary and Steve were added).
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 3bcd2006b56ad57caa7e8723c3269cbd50af1f4a
Component: engine
2015-03-11 17:38:35 -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
Doug Davis
2c409e6dd8 Fix builder when num of RUN args is 1
FROM scratch
ADD echo /
RUN [ "echo" ]

will die with
  exec: "/bin/sh": stat /bin/sh: no such file or directory

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 645f8a32df3b5b22e5e194664a9f0733709714c9
Component: engine
2015-03-11 07:30:44 -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