toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,468 Commits 3 Branches 295 Tags
014bce304c89d41c08662890df280a1ba4fd5d64
Commit Graph
7468 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
unclejack 014bce304c Merge pull request #5234 from crosbymichael/refactor-container-start 
Refactor container start
Upstream-commit: 2d6f537bb30d7d096dbde83cbf4df9fa7f6c5f57
Component: engine
 2014-04-17 02:20:35 +03:00
unclejack 497ecf2fc0 Merge pull request #5243 from creack/hairpin_nat_test 
Add integration test for hairpin nat
Upstream-commit: 66480d67fb90a5e307936785e4aa78b51486ab93
Component: engine
 2014-04-17 01:44:56 +03:00
O.S. Tezer a1a986e108 Merge pull request #5245 from SvenDowideit/more-working-with 
this topic nolonger crashes the build
Upstream-commit: b92c86764a7265b569ea960eb9db666e73e77102
Component: engine
 2014-04-17 01:44:50 +03:00
Sven Dowideit 6ccec3eab2 this topic nolonger crashes the build 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 4ba7b28006620962ae8a0f6cb5865a5e1a65b332
Component: engine
 2014-04-17 08:43:07 +10:00
Sven Dowideit 85dd0db1d0 Merge pull request #5233 from ostezer/docs-fix-scroll-header-margin 
Fix headers staying under the menu when clicked-to-scroll.
Upstream-commit: f85d03327d5180611d399ce5c8f2d545c11473aa
Component: engine
 2014-04-17 08:40:55 +10:00
Sven Dowideit 42e22eb4ac Merge pull request #5231 from ostezer/fix-breadcrumbs 
Amend breadcrumbs to link to the section indexes, i.e., home/:section/
Upstream-commit: 2f3cccfcbd8eb1ba70243373c91364bebbef50b0
Component: engine
 2014-04-17 08:40:40 +10:00
Guillaume J. Charmes c35b2bba93 Add integration test for hairpin nat 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 1775ed8c75fabb3544402ca13afe7a4c35b27038
Component: engine
 2014-04-16 14:50:11 -07:00
O.S.Tezer 6ce979b21a Fix headers staying under the menu when clicked-to-scroll. 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 882862b095fb0bf6b554c2b11123c608ff68025e
Component: engine
 2014-04-16 19:38:08 +03:00
O.S.Tezer a746b7ee69 Amend breadcrumbs to link to the section indexes, i.e., home/section/ 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: b74fa7587228361f2e13606c260f559b56aaf323
Component: engine
 2014-04-16 18:20:29 +03:00
O.S. Tezer 2ab96284b5 Merge pull request #5227 from SvenDowideit/fix-conversion-urls-securityblog 
rst->md conversion fix
Upstream-commit: 24c4c3e0e99ddb4d65200f2f7367883e47008898
Component: engine
 2014-04-16 13:11:29 +03:00
Sven Dowideit 20f9c08a40 rst->md conversion fix 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ce7d251d520443228d5058f4fa9185b2f7e7b075
Component: engine
 2014-04-16 14:43:52 +10:00
Solomon Hykes 927cbbfeb1 Merge pull request #5204 from ostezer/new-maintainer 
Adding myself to the MAINTAINERS
Upstream-commit: 9b6c40cf69e048a5a23fc9a20b0fe7224d60d8ea
Component: engine
 2014-04-15 21:19:39 -07:00
Sven Dowideit b169931da8 Merge pull request #5224 from dhrp/tp-titles-colors 
Changed heading colors and some alignments (no longer center and justification in left column)
Upstream-commit: 8e35bb256d07bfa7e6374759baf9c081fe6a46a8
Component: engine
 2014-04-16 13:07:52 +10:00
Thatcher Peskens 4d9a02a306 Changed heading colors and some alignments (no longer center and justification in left column) 
Docker-DCO-1.1-Signed-off-by: Thatcher Peskens <thatcher@docker.com> (github: dhrp)
Upstream-commit: 4d3e448a33f87ed18def8f4ee7a01ef66bc6549e
Component: engine
 2014-04-15 19:15:13 -07:00
Sven Dowideit a8d6e0c894 Merge pull request #5219 from dotcloud/master-doc-markdown 
now, with shiney markdown
Upstream-commit: b9f66049fa4d0dc2cdc0a430fe14029214456611
Component: engine
 2014-04-16 11:05:29 +10:00
Sven Dowideit c4684e29f0 now, with shiney markdown 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ac999a9cb2b0976e021aeb8825bb051df6bd0976
Component: engine
 2014-04-16 11:04:14 +10:00
Sven Dowideit 5c2b3f3f64 move the documentation to markdown 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a777ebcee6326bed2f7e99eedf6edbb922175e2d
Component: engine
 2014-04-16 11:04:01 +10:00
Sven Dowideit c9de801094 Merge pull request #5206 from SvenDowideit/stage-markdown 
move the documentation to markdown
Upstream-commit: ede9ea37c39d52b12bb7d773070fa73219505f10
Component: engine
 2014-04-16 10:08:57 +10:00
Sven Dowideit 0bb55ea3f4 move the documentation to markdown 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: )
Upstream-commit: 936a03bfddb24cd45f5f12c20a961bf2ae6ede93
Component: engine
 2014-04-16 00:02:10 +00:00
O.S.Tezer d4a731f106 Adding myself to the MAINTAINERS file. 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 32d8b5da5080cf4ef9f27636d1ee52c8b79eb890
Component: engine
 2014-04-16 00:33:14 +03:00
unclejack 388b678ba2 Merge pull request #5211 from crosbymichael/update-cgroup-defaults 
Ignore not exist errors for joining default subsystems
Upstream-commit: 80f6b011328ad81fdf68d073b4dc771ec21cba23
Component: engine
 2014-04-15 22:55:26 +03:00
Tianon Gravi ede836d1af Merge pull request #5201 from tianon/build-busybox 
Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests
Upstream-commit: 994b7eaeb736c745442cae84126e30fa079e3dfe
Component: engine
 2014-04-15 09:47:05 -06:00
Tianon Gravi 57da9f5a5d Merge pull request #5181 from uggedal/mkimage-alpine 
contrib: mkimage script for alpine linux
Upstream-commit: de167a75145a52f2099cab342c237c191b7db478
Component: engine
 2014-04-15 08:09:42 -06:00
unclejack 32c2479f3c Merge pull request #5202 from vieux/allow_dot_repo 
Allow dot in repo name
Upstream-commit: 8b54e57fa81b55d0fd42935505734719a348d6cf
Component: engine
 2014-04-15 13:58:33 +03:00
Eivind Uggedal 80f4de5d30 contrib: mkimage script for alpine linux 
Docker-DCO-1.1-Signed-off-by: Eivind Uggedal <eivind@uggedal.com> (github: uggedal)
Upstream-commit: 6a2bdc6eb769ffd1d8438f321953dde8b341b783
Component: engine
 2014-04-15 07:59:42 +00:00
Victor Vieux 680490e66c allow dot in repo name 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d61fce9af770f0adaf4f178a5217dd46a02dd201
Component: engine
 2014-04-14 23:15:38 +00:00
Tianon Gravi abb1fb2274 Fetch the "busybox" image source so we can build locally instead of pulling during the integration tests 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7bb72fa080d13c3b90d624cb77530632c7705c56
Component: engine
 2014-04-14 13:35:54 -06:00
Guillaume J. Charmes 2355a3647b Merge pull request #5158 from vieux/refactor_build_only_configFile 
refactor build job to know only configFile
Upstream-commit: e5ad715e5964bc64e098070d1ca72b110c337d1a
Component: engine
 2014-04-14 10:59:48 -07:00
Guillaume J. Charmes feaba75b7b Merge pull request #5075 from tianon/update-check-config 
Update check-config.sh with more kernel configs and more reliable cgroup hierarchy/subsystem check
Upstream-commit: 19ffc5e92f5ddfc197890b0bc6a51187d0fd1916
Component: engine
 2014-04-14 10:58:00 -07:00
Victor Vieux 0ac428f052 Merge pull request #5132 from crosbymichael/fix-cgroup-hiar 
Setup cgroups for supported subsystems
Upstream-commit: 5fc1b4d2cd76cb0d04f66c85424d54408e70037f
Component: engine
 2014-04-14 10:56:15 -07:00
Guillaume J. Charmes 156fab79f3 Merge pull request #4878 from kzys/freebsd-utimes 
Support FreeBSD on pkg/system/utimes_*.go
Upstream-commit: f98ed28c1dd5766cb8c80f32418f13878df29e6c
Component: engine
 2014-04-14 10:39:25 -07:00
Michael Crosby 1d8323fa8e Merge pull request #5172 from pnasrat/5166-large-image-graph-restore 
Enable construction of TruncIndex from id array.
Upstream-commit: 413190e1590740ee4fd1886a8c250979df3076eb
Component: engine
 2014-04-14 10:31:16 -07:00
Victor Vieux 51ab1031ea rename configFile to auth in the job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e9c3e397436221528312c0d3b291ae5a12862ed2
Component: engine
 2014-04-14 17:15:22 +00:00
unclejack 01872204ed Merge pull request #5160 from kzys/fs-symlink 
Fix utils.FollowSymlinkInScope's infinite loops bug
Upstream-commit: 0037dee02cdfec3a495e4fc797393248ed3e4bec
Component: engine
 2014-04-14 20:12:39 +03:00
O.S. Tezer ab0b17d0d0 Merge pull request #4828 from almoehi/patch-1 
Added reactive-docker to list of remote API clients
Upstream-commit: b255d96694e561fd2ed5b1a5c45b7cdc01af7ffb
Component: engine
 2014-04-14 19:06:59 +03:00
Michael Crosby c523a86079 Remove ArgsAsString because its a util function 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 9bd7d09871d8495d06af94a8d866404569d75b8e
Component: engine
 2014-04-14 07:08:54 +00:00
Michael Crosby f02d8ea2c4 Fix resolvconf logic 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 35a88f2c291c882e49f7c448c1581dfdd3e35a9c
Component: engine
 2014-04-14 06:58:04 +00:00
Michael Crosby 757f2fd1a0 Remove container.When method 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 71b241cbfe5b0100ee2ee0fd0e651beccd965746
Component: engine
 2014-04-14 06:54:40 +00:00
Michael Crosby f2bd1e6d7d Refactor container start to make it more manageable 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c99ba05c844d4099b85c653edc0c0f5122ccb522
Component: engine
 2014-04-14 06:46:34 +00:00
Michael Crosby 55d539294f Move network settings into separate file 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f00ca72baa6c43de35d622caa728587a752d6e5e
Component: engine
 2014-04-14 06:15:31 +00:00
Paul Nasrat 936bcbbb79 Add benchmark tests for TruncIndex. 
Compare add vs new.

Some historical data in PR #5172.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
Upstream-commit: 84a76f27962d4f4b3871abe925ca17024bdeea73
Component: engine
 2014-04-13 22:36:15 -04:00
Michael Crosby fbaa43b382 Ignore not exist errors for joining default subsystems 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 184728e7bcf9af3224f53e8d5d38d44b08de24ec
Component: engine
 2014-04-14 00:07:48 +00:00
Tianon Gravi 20850020f5 Merge pull request #5176 from unclejack/check_before_pulling 
cli integ: don't fetch busybox if it exists
Upstream-commit: 2d20c92d29775f9c4c2fff3c4809d507138e1523
Component: engine
 2014-04-13 09:28:30 -06:00
unclejack 103b32014b cli integ: don't fetch busybox if it exists 
Don't make calls to the registry if the image exists already.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 449f92f11ed34d4475fa24e2561b02cc263722bf
Component: engine
 2014-04-13 15:06:15 +03:00
O.S. Tezer 031e906716 Merge pull request #5177 from jbbarth/docs-add-common-errors-for-test-suite 
Docs: add some example log lines that indicate a lack of memory when running the test suite
Upstream-commit: 370b935b4987c79eec769b0cc3788726a3f8abc9
Component: engine
 2014-04-12 21:03:24 +03:00
O.S. Tezer 4df48cc2f4 Merge pull request #5178 from jbbarth/docs-improve-ubuntulinux-accounting-section 
Docs: improve installation/ubuntulinux memory and swap accounting section
Upstream-commit: 1f7e97e951b32cc804f627257f3955263d4dfbbd
Component: engine
 2014-04-12 20:32:26 +03:00
Jean-Baptiste Barth 2cd55701e9 Docs: improve installation/ubuntulinux memory and swap accounting section 
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> (github: jbbarth)
Upstream-commit: 0a0e49d406d10ce7c79952c78162768dd05ee875
Component: engine
 2014-04-12 10:57:19 +00:00
Jean-Baptiste Barth 8d072a85fc Docs: add some example log lines that indicate a lack of memory when running the test suite 
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> (github: jbbarth)
Upstream-commit: 26845ef1ae97be3904b2fd85fa06f9a97ccee67c
Component: engine
 2014-04-12 02:09:06 +00:00
Kato Kazuyoshi d4a5ca9f47 Fix utils.FollowSymlinkInScope's infinite loop bug 
fs_test.go doesn't finish if Docker's code is placed under a directory
which has symlinks between / and the directory.
For example, the below doesn't finish before the change.

  /home -> usr/home
  FollowSymlinkInScope("/home/bob/foo/bar", "/home/bob/foo")

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 0f724863468733847306f47835739f480a7fac63
Component: engine
 2014-04-12 07:37:18 +09:00
Kato Kazuyoshi 82b2213679 Add the test to reproduce the issue even in "make test" 
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: e3e078ca2fc4ce76461a40533add9f33afcd1abe
Component: engine
 2014-04-12 07:37:17 +09:00