toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,455 Commits 3 Branches 295 Tags
dcdf67a6ece5e6652f318a4413aa117d466cd69f
Commit Graph
13455 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass dcdf67a6ec Merge pull request #11112 from tianon/bashrc-for-tibor-♥ 
Add support for an optional ".bashrc" file
Upstream-commit: 360adc707b6ec2023178ed95befeb5514e530ca3
Component: engine
 2015-03-02 13:02:39 -05:00
Tianon Gravi 0a09f8ffe0 Add support for an optional ".bashrc" file 
If `.bashrc` exists at the root of the source tree, it will be used as the `~/.bashrc` inside the container.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c62230a879e0461c43a4fc7d2e2e2efdd466fedd
Component: engine
 2015-03-02 10:33:26 -07:00
Phil Estes 8ccc0c87e2 Merge pull request #11003 from brahmaroutu/rename_10996 
Prefix / is ignored when container is renamed
Upstream-commit: 89db94ecf904bf09dbf80ca879a2b759443e2392
Component: engine
 2015-03-02 09:48:07 -05:00
moxiegirl b8344b4ef2 Merge pull request #11060 from dmitrygusev/docs-improvements 
Docs improvements typo fixes and consistency
Upstream-commit: 6bbf5c3e99d9943d6526a415de0875c441266eff
Component: engine
 2015-03-02 06:46:17 -08:00
Phil Estes ae2cbed644 Merge pull request #11073 from zenlinTechnofreak/zenlinlogerrfix 
To avoid the confusing in log, change '%s' to '%q', change the question ...
Upstream-commit: a3dc3bb758a40562f34659846b18243c72e94caa
Component: engine
 2015-03-02 09:30:59 -05:00
Phil Estes 69f4fa385f Merge pull request #11096 from MabinGo/fix_comments_typo 
fix wrong description and typo in daemon/graphdriver/devmapper/deviceset.go
Upstream-commit: 5c2a602b4e227ed617d0494bdaeb2e191a6b9fca
Component: engine
 2015-03-02 08:55:51 -05:00
Zen Lin(Zhinan Lin) 87e987a3ef To avoid the confusing in log, change '%s' to '%q', change the question sentence to a reminding sentence. 
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
Upstream-commit: 08ea03ccb9c6c671b465572e4a5c9a5d1da1fda0
Component: engine
 2015-03-02 19:14:22 +08:00
Mabin f3df541809 fix typo of comments in daemon/graphdriver/devmapper/deviceset.go 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: f4ac86de84c25bf1793d1e934695b7119dc51b70
Component: engine
 2015-03-02 02:11:15 +08:00
moxiegirl 72bb80ff64 Merge pull request #11089 from thaJeztah/carry-11063-update-mac-links 
Fix incorrect https example in mac.md (carry of 11063).  This is a fix for a typo. And a single line tweak.
Upstream-commit: a61716e5d93796ebc29b16942d5f27d387e56fba
Component: engine
 2015-02-28 16:05:47 -08:00
Sebastiaan van Stijn b10d9ac0eb Fix incorrect https example in mac.md (carry of 11063) 
The document referenced https but was using the http port. I changed the
examples from https to http.

Also, fyi, when I tried accessing https using the correct 443 port, it
did not work. I have not investigated why. Port 80 worked fine.

For me:
jay-mac:.ssh jay$ docker port web
80/tcp -> 0.0.0.0:49153
443/tcp -> 0.0.0.0:49154
jay-mac:.ssh jay$ boot2docker ip
192.168.59.103

works: http://192.168.59.103:49153/
fails: https://192.168.59.103:49154/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1d4b2524ec080a19f47292020a7fb6a9a00c8932
Component: engine
 2015-02-28 22:13:03 +01:00
Doug Davis 6082afbea4 Merge pull request #11075 from coolljt0725/fix_minor_typo 
Fix a minor typo in daemon/container.go
Upstream-commit: 1dddf8a9a6dcdca036a9e264831345516e88745e
Component: engine
 2015-02-28 09:24:28 -05:00
Lei Jitang 1f225ba7bc Fix a minor typo in daemon/container.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 40dc18e2fa3724c5c4361f42a413c754ee03a492
Component: engine
 2015-02-28 18:43:28 +08:00
Jessie Frazelle 874029c008 Merge pull request #11070 from jfrazelle/fix-racyevents-test 
fix racy events test
Upstream-commit: b52a2cfdf1aabf15a4a1a630b3899ae373516517
Component: engine
 2015-02-27 14:50:17 -08:00
Jessica Frazelle 15ea5ae8fb fix racy events test 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 202709d178a24bcbfac223f0bcd9c4eda669e928
Component: engine
 2015-02-27 14:48:39 -08:00
Srini Brahmaroutu 2b1fd26fbf Prefix / to the container name is ignored when container is renamed 
Closes #10996

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: caaae78247d9ceecba07da381401c2376b478c2b
Component: engine
 2015-02-27 22:40:04 +00:00
Dmitry Gusev 4020847acb Update cli.md 
Use `-it` combination in example instead of `-ti`, because this is how it used everywhere in examples.

Update dockerfile_best-practices.md

Fix typo in command name

Signed-off-by: Dmitry Gusev <dmitry.gusev@gmail.com>
Upstream-commit: 39b3690ba1801b36c1f43fa220ae5128958a0739
Component: engine
 2015-02-27 23:18:32 +03:00
Jessie Frazelle 7595c1bf94 Merge pull request #10998 from jfrazelle/fix-filter-events-test-better 
Fix events test so it doesnt need new daemon
Upstream-commit: 2768ce0e4e773d0a0331c6294f31fd9ff9450062
Component: engine
 2015-02-27 12:05:48 -08:00
Jessie Frazelle 030e1d866f Merge pull request #11037 from coolljt0725/add_parse_mac 
Add validate the input mac address on docker run command
Upstream-commit: 314a678da7f948548a7f5aae886b3089ce4a7c9b
Component: engine
 2015-02-27 12:03:25 -08:00
Jessie Frazelle 80fc2cf3da Merge pull request #11011 from coolljt0725/fix_rmi_conflict 
Fix docker remove an image show misleading conflicts
Upstream-commit: 13030add69ca84a853c036ac139f3325afc1b0e0
Component: engine
 2015-02-27 12:00:12 -08:00
Jessie Frazelle ec994adca7 Merge pull request #11002 from ahmetalpbalkan/win-cli/dockerfile-path-fix 
Support windows style dockerfile paths for build cmd
Upstream-commit: 1061c56a5fc126a76344ea9dca9aa5f5e75eb902
Component: engine
 2015-02-27 11:57:19 -08:00
Lei Jitang b540023f69 Add validate the input mac address on docker run command 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2ba0fbb0ae1701b638a4bb956187dd878385dc80
Component: engine
 2015-02-27 07:27:12 -08:00
Phil Estes 2d06b1cf02 Merge pull request #11017 from brahmaroutu/random_10962 
moving random.go from utils
Upstream-commit: f5850e8e30b9420d26bd12136d8bbb6669d1e2bb
Component: engine
 2015-02-26 21:35:42 -05:00
Jessie Frazelle 91a8e60aaa Merge pull request #11013 from delftswa2014/10965-timeout 
Move TimeoutConn to seperate pkg dir.
Upstream-commit: fe554589c0456c32d370615796c4fde4ecc23080
Component: engine
 2015-02-26 17:40:42 -08:00
Jessie Frazelle b74aa8d071 Merge pull request #11029 from brahmaroutu/fixtest_10963 
When --net=none enabled, the test uses local filesystem
Upstream-commit: bcbe70588d1ff3ff28d78d56e221ff1efb7bbc47
Component: engine
 2015-02-26 17:30:02 -08:00
Jessie Frazelle 5bd9f0f7c0 Merge pull request #10902 from estesp/10855-fix-add-host-doc 
Correct --add-host documentation regarding host IP address retrieval
Upstream-commit: 94553f1ba6bd9f26059fc909586fd95230676432
Component: engine
 2015-02-26 17:25:01 -08:00
Jessie Frazelle bf718cd3ba Merge pull request #11044 from moxiegirl/fix-image-11043 
Rep README Fixing broken logo image 
Upstream-commit: ac2521b87cfb9670bd3bfbf1a1ef8d8075e63737
Component: engine
 2015-02-26 13:03:14 -08:00
Jessie Frazelle 272eeccbe2 Merge pull request #11007 from ahmetalpbalkan/context-close-cleanup 
integ-cli: Add a few missing context cleanups
Upstream-commit: 082b7726e22c4e7e161cb715158675ed24fc3e4c
Component: engine
 2015-02-26 11:05:30 -08:00
Srini Brahmaroutu e051d5c51d moving random.go from utils 
Closes #10962
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 53ece336dcab8e778fc37afc7a264f7d168110ff
Component: engine
 2015-02-26 18:31:18 +00:00
Srini Brahmaroutu f720e9d2f5 When --net=none enabled, the test uses local filesystem 
Closes #10963
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 17b6583a5a352d5cf6d8ba20b018dc96f231f476
Component: engine
 2015-02-26 18:24:34 +00:00
Doug Davis 0edfd99487 Merge pull request #11036 from liusdu/fix-typo 
fix a minor typo in daemon/exec.go
Upstream-commit: 1d6f469764671863004dd6f685d0dc72290ec04b
Component: engine
 2015-02-26 10:02:46 -08:00
Mary Anthony f6890f9c00 Smaller image 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: 02639c03b78e325f2e87e0fbcb4f1db4e04fe847
Component: engine
 2015-02-26 08:48:58 -08:00
Mary Anthony a56cc9bb41 Fixing broken logo image 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: 2e567d22da23773bbd7997cec138c0ea92b69cb3
Component: engine
 2015-02-26 08:45:59 -08:00
Jessie Frazelle 38df4a721b Merge pull request #10831 from MalteJ/ipv6-ndp-proxy 
Adding IPv6 NDP Proxying documentation
Upstream-commit: 9324cdac07484373c752f3368c3cb30db070b839
Component: engine
 2015-02-26 07:19:36 -08:00
Sven Dowideit a8ca53b636 Merge pull request #11039 from SvenDowideit/fix-missing-compose-docs 
Missed to added doc files
Upstream-commit: 7a93d52ea44405cd8e6c2644a3f849c00b327cc6
Component: engine
 2015-02-27 01:13:35 +10:00
Sven Dowideit 7bf2abf2b6 Missed to added doc files 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 7646e3f9574aabe7ebbd6eb8dc2ef0f4fcc4e3a9
Component: engine
 2015-02-27 01:10:50 +10:00
Liu Hua 394722ec93 fix a minor typo in daemon/exec.go 
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Upstream-commit: 5b794c413a147dbc06f76caa6f2c32d1f4b1f2ce
Component: engine
 2015-02-26 19:11:27 +08:00
Tibor Vass 8ee6a61615 Merge pull request #10869 from SvenDowideit/extract-docs-base 
Extract docs base
Upstream-commit: 7e2328b76e041bb7a1acb3e20dbea0c379f7f024
Component: engine
 2015-02-25 23:16:46 -05:00
Lei Jitang 4bec37b70e Fix docker remover an image show misleading conflicts 
due to its dependency is tagged to multiple repositories

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d9d9175507f3ac2d43fa27bc5f0710c79cd14cfc
Component: engine
 2015-02-26 12:01:35 +08:00
Sven Dowideit d372e2ab22 update the mkdocs.yml to add new docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 6d4b0f53342f4b56ad0770bd0e1bce6fcd898a41
Component: engine
 2015-02-26 12:11:29 +10:00
James Turnbull 0c7bf5829a Merge pull request #10940 from 1HLtd/master 
docs/man/docker.1.md: spelling mistake fix
Upstream-commit: f8dbcdc5994a300308f4d259c62b58974a25e028
Component: engine
 2015-02-25 20:45:46 -05:00
Sven Dowideit a1794f8b7d set the document meta-data for the orchestration docs to turn off the docker-version documentation dropdown, asit doesn't apply 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0365e8c20422f96d14c6448218b02e59734e59ea
Component: engine
 2015-02-26 11:41:39 +10:00
Sven Dowideit 119882d0e4 Manually place the orchestration docs into the menu 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ac47a877403a894ac02724aaa111870edc7c2f8b
Component: engine
 2015-02-26 11:41:39 +10:00
Sven Dowideit 17fe06fc30 Don't require Docker 1.5.0 for docker build -f docs/Dockerfile 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 8d4459fffb5c1885b65506093538e059f0b51d90
Component: engine
 2015-02-26 11:41:39 +10:00
Sven Dowideit 824b119187 Import docs from swarm, machine and compose repositories, 
Also add the image spec from the code area to show we're building from the repo-root now

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 3e84b9e56abdff7230e84a1830085c79c73aa3b7
Component: engine
 2015-02-26 11:41:39 +10:00
Sven Dowideit 593a99f129 Simplify the existing docs building by extracting the main Dockerfile into a docs/base Hub image 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ab545aed4c90134b33c9aab600ab2d18b6eafd73
Component: engine
 2015-02-26 11:41:39 +10:00
Jessie Frazelle 71c9fa9fcf Merge pull request #11025 from crosbymichael/test-rm-dev 
Reinit slice for each dir in search
Upstream-commit: 321f4f06837fb5b8c1e8beb472a41c4961ec6f3a
Component: engine
 2015-02-25 16:18:05 -08:00
Michael Crosby 205614d416 Reinit slice for each dir in search 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 8be8e41429a3af59df35a6b0281eefd2bb34e1b5
Component: engine
 2015-02-25 15:53:07 -08:00
Michael Crosby 56a989cee4 Merge pull request #10510 from ashahab-altiscale/9875-lxc-image-layer 
Added /dev paths to layer comparison
Upstream-commit: 481e75203d8c5db264a795c35d422d081a2f03b0
Component: engine
 2015-02-25 14:52:31 -08:00
Michael Crosby 47a091cc6c Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats 
Implements stats for lxc driver
Upstream-commit: 9a2e58dd2940d11d3c8f22a0fabe54591a5e3619
Component: engine
 2015-02-25 13:46:18 -08:00
Rik Nijessen 967da32c28 Rename package timeout to timeoutconn. 
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
Upstream-commit: 7e7646c28a599731e62afec4c0c4dc0942309b7f
Component: engine
 2015-02-25 20:52:37 +01:00