b8221b0ce7Merge branch 'docs20130627' of github.com:metalivedev/docker into docs20130627
Andy Rothfusz
2013-07-02 13:00:08 -07:00
ad16b4b27cShortened lines to 80 columns Upstream-commit: dd4c6f6a09c98f075fc5964242792d9e9f2c20d4 Component: engine
Andy Rothfusz
2013-07-02 12:07:09 -07:00
df5dac21e6Clean up image text, minor updates to docs. Upstream-commit: 6058261a26b9e23926612fddfd8ad37bfcf1dd9c Component: engine
Andy Rothfusz
2013-07-01 16:32:58 -07:00
09eb5cc9ffAdding files for terms Upstream-commit: b461e4607de497096b0ec92bb05d5a88bfe0e48d Component: engine
Andy Rothfusz
2013-06-28 15:30:22 -07:00
66a935418fCleaning up the welcome page, terminology. Upstream-commit: d399f720983d94706bdaae528a2637778ca5b5e0 Component: engine
Andy Rothfusz
2013-06-28 15:17:06 -07:00
831c6f9959Merge pull request #1107 from eliasp/issue-1020
Guillaume J. Charmes
2013-07-02 11:42:44 -07:00
805a9b9625never remove the file and try to load it in start Upstream-commit: 3042f11666a38ea6b1da206de372bf85463db945 Component: engine
Victor Vieux
2013-07-02 18:02:16 +00:00
f94dc93764Don't remove the container= environment variable, as it is crucial for a lot of tools to detect, whether they're run inside an LXC container or not. Upstream-commit: e5e47c98629f9e81ea24d2784e04863d614d34f5 Component: engine
Elias Probst
2013-07-02 19:13:37 +02:00
a189f7d618Merge pull request #1103 from shin-/1060-pull-only-tagged-images
Victor Vieux
2013-07-02 10:08:21 -07:00
9389c940d4When no tag is specified in docker pull, skip images that are not tagged Upstream-commit: 7cc294e777f8151061efa4a9da5f59d2f992473b Component: engine
shin-
2013-07-02 18:25:06 +02:00
6695c179f1Merge pull request #987 from dotcloud/601-packaging-ubuntu
Daniel Mizyrycki
2013-07-02 08:51:01 -07:00
be9588204fstore hostConfig to /tmp while container is running Upstream-commit: 06b53e3fc7aca2b3dae32edab08c7662d3e9e7e8 Component: engine
Victor Vieux
2013-07-02 12:19:25 +00:00
d6b3d1ae9eMerge pull request #1101 from dotcloud/fix-unit_tests
Victor Vieux
2013-07-02 03:48:24 -07:00
438fda3245add sleep in tests and go fmt Upstream-commit: ebba0a60245b487e6d3d242f47c8999321ec5d29 Component: engine
Victor Vieux
2013-07-02 10:47:37 +00:00
8f4cd54500Merge pull request #1099 from lopter/master
Victor Vieux
2013-07-02 02:42:21 -07:00
40f3d8b8b8More unit test fixes
Louis Opter
2013-07-01 17:19:39 -07:00
9e73607525Merge pull request #1097 from dotcloud/bump_0.4.8
Guillaume J. Charmes
2013-07-01 17:13:19 -07:00
8b7816d5d5Bump version to 0.4.8 Upstream-commit: 96a1d7c6455b5b4326469f9a51bee869883aac3c Component: engine
Guillaume J. Charmes
2013-07-01 16:57:58 -07:00
f8f9a4db66Merge pull request #1046 from dotcloud/1043-output_id_non_attach-fix
Guillaume J. Charmes
2013-07-01 16:49:43 -07:00
0a35df273eMerge pull request #1092 from lopter/master
Victor Vieux
2013-07-01 16:41:01 -07:00
de55ad0e3dClean up image text, minor updates to docs. Upstream-commit: b47873c5accd33964c33f718ceeda955d1a9a3c8 Component: engine
Andy Rothfusz
2013-07-01 16:32:58 -07:00
c4bb1a9c18Adding files for terms Upstream-commit: adf75d402ab428a16ac3d57d0154ddd02be2fb6b Component: engine
Andy Rothfusz
2013-06-28 15:30:22 -07:00
52be3958ffCleaning up the welcome page, terminology. Upstream-commit: cb1fdb2f0380e43f38f3b37562edc83122c8349f Component: engine
Andy Rothfusz
2013-06-28 15:17:06 -07:00
b992f88df2Merge pull request #1078 from kstaken/fix_json_error
Victor Vieux
2013-07-01 16:36:58 -07:00
18ad40a645Fix TestGetInfo when there is more than one image in the test repository
Louis Opter
2013-07-01 15:06:08 -07:00
08f73695abMerge pull request #1089 from dotcloud/multiple_test_images-fix
Guillaume J. Charmes
2013-07-01 13:58:04 -07:00
4af6128790Merge pull request #1086 from crosbymichael/1008-image-entrypoint
Guillaume J. Charmes
2013-07-01 13:33:12 -07:00
10626ab362Merge pull request #1088 from kpelykh/master
Ken Cochrane
2013-07-01 12:50:31 -07:00
4fd8f2839fFix unit tests when there is more than one tag within the test image Upstream-commit: b6f288a1cedbbff7dd24362f2fc2bce0040bfe10 Component: engine
Guillaume J. Charmes
2013-07-01 11:45:45 -07:00
9e16e5309dIssue #1087 Docker Java API client -- added java to Docker Remote API Client document Upstream-commit: aa9bec96b1d3aedcb67e6985ae5754e728665407 Component: engine
zettaset-kpelykh
2013-07-01 11:28:40 -07:00
ab729772a8change to top Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c Component: engine
Victor Vieux
2013-07-01 15:19:42 +00:00
2e70c0f0f0Add Entrypoint to builder and container config
Michael Crosby
2013-06-24 17:20:05 -09:00
727efac9d6Merge pull request #1085 from dotcloud/1076-doc_delete-fix
Victor Vieux
2013-07-01 06:30:21 -07:00
867f33af50fix status code in doc Upstream-commit: 8dcc6a0280720237008e36e893028032cd66aa2a Component: engine
Victor Vieux
2013-07-01 13:28:58 +00:00
51b93736d6* Hack: change builder tests to always use the current unit test image, instead of hardcoding 'docker-ut' Upstream-commit: 273e0d42b7bd56f263d4d2d95fb27a692b875377 Component: engine
Solomon Hykes
2013-06-29 21:22:15 -07:00
4240b58553Bump version to 0.4.7 Upstream-commit: ca497a82abfe92f2dbe1a7e161dc7ff19eefeec4 Component: engine
Solomon Hykes
2013-06-28 17:51:14 -07:00
f44918dcc7* Hack: move unit tests to a different source image, to work around issues when docker-ut has more than 1 tag. Upstream-commit: b7226316c716daf7648b2dc4de829f866a4377b5 Component: engine
Solomon Hykes
2013-06-28 19:43:55 -07:00
84c3646cd3Merge pull request #1052 from lopter/master
Guillaume J. Charmes
2013-06-28 17:00:51 -07:00
e3b18af210api,server: slice are already refs, no need to return ptr Upstream-commit: 54da339b2c3d1fe11a465aff69fc4e00ec3b40fd Component: engine
Johan Euphrosine
2013-06-28 12:41:09 -07:00
ddffbf8c3dFixed conflicts Upstream-commit: ac37fcf6f3f28f56b4ad58143891be9b1fe99dec Component: engine
Sam Alba
2013-06-28 12:36:59 -07:00
2be0a9146eResolve conflict Upstream-commit: 893c974b08b8859a4d6d3d7d38d9c21c9b6472c3 Component: engine
Sam Alba
2013-06-28 12:32:41 -07:00
d496b27176Merge pull request #700 from dotcloud/615-pushbyid
Joffrey F
2013-06-28 10:29:10 -07:00
fe04096783Merge pull request #1057 from dotcloud/973-testing-stabilization
Daniel Mizyrycki
2013-06-28 09:54:06 -07:00
0081ddc545Allow push by ID when using a custom registry Upstream-commit: e095a1572fb8a2ba17ea231abcb3704cf83a96e4 Component: engine
shin-
2013-06-27 19:17:20 +02:00
4eec06d217Several fixes and updates to make this work with latest changes in master Upstream-commit: c3dd6e1926f9359f840a9f7b0be9cfa7fe2cfea2 Component: engine
shin-
2013-06-25 21:03:42 +02:00
d5e7a7e8e9Reenable writeflusher for pull Upstream-commit: 67ecd2cb822894e4d35adea031e5b79d7ca8e91a Component: engine
Guillaume J. Charmes
2013-06-05 15:13:01 -07:00
01a345c7fbRemove https prefix from registry Upstream-commit: 57d751c3770194ff867ebace36eb1be7d72d2fe9 Component: engine
Guillaume J. Charmes
2013-06-05 15:12:50 -07:00
3635092ee9Rolled back of previous commit (skip cert verification) Upstream-commit: 50075106b658ab4dc82d5361e4786f7d28cc570a Component: engine
shin-
2013-05-29 11:39:31 -07:00
a944a8deb6Ignore 'registry not found' when pushing on independent registries Upstream-commit: 2a1f8f6fda55a5fa2132dbad374043e9fbf6d9f6 Component: engine
shin-
2013-05-29 11:25:49 -07:00
6af1e08d14Skip certificate check (don't error out on self-signed certs) Upstream-commit: 1c817913eee7d87badc2a2748447729619d8aaf0 Component: engine
shin-
2013-05-29 11:24:50 -07:00
1f3a1ee5caTentative support for independent registries Upstream-commit: de0a48bd6ff2acfb2ab546a1e718185872eea2c3 Component: engine
shin-
2013-05-24 10:37:34 -07:00
6657ec16bdadd /proc to list running processes inside a container Upstream-commit: 2e79719622964eb95eca70372ced0ad6e4dce4f5 Component: engine
Victor Vieux
2013-06-28 15:51:58 +00:00
865986c53ddo not merge hostname from image Upstream-commit: 9bfec5a5389207cba4cdbdd7eafc692c65278ce0 Component: engine
Tobias Schwab
2013-06-28 15:22:01 +02:00
ad4f82e6d2Merge pull request #1032 from andrewsmedina/govet
Victor Vieux
2013-06-28 05:27:53 -07:00
26d95fb135Merge pull request #1028 from dhrp/bugfixes-on-docs
Thatcher
2013-06-27 19:01:13 -07:00
e4d371fd60Always return the correct test image.
Louis Opter
2013-06-27 17:53:57 -07:00
09791158d7Fix a nil dereference in buildfile_test.go
Louis Opter
2013-06-27 17:52:47 -07:00
5063918d95URL schemes of both Registry and Index are now consistent Upstream-commit: 3175e56ad03cbe0118c0982606c5eba9e34c1b07 Component: engine
Sam Alba
2013-06-27 17:55:17 -07:00
65b2fd1698Ignore stderr while doing tests Upstream-commit: 800d9006883228365a375800254871397cb1a011 Component: engine
Guillaume J. Charmes
2013-06-27 15:25:31 -07:00
2afee8496cMerge pull request #1035 from dotcloud/fix_panic_cast
Guillaume J. Charmes
2013-06-27 15:22:18 -07:00
f7d1250f60Merge pull request #1041 from unclejack/fix_minor_kernel_version_for_git_kernels
Guillaume J. Charmes
2013-06-27 15:21:34 -07:00
13ee8793a9Make sure the ID is displayed usgin run -d Upstream-commit: bd144a64f652895a41b67464a426839ef79d73dc Component: engine
Guillaume J. Charmes
2013-06-27 12:48:25 -07:00
d68905c249Improve last log output Upstream-commit: 2a20e852032339b4c91a01748119701c7ada234d Component: engine
Guillaume J. Charmes
2013-06-27 11:10:19 -07:00
c26a152aebremove + from minor kernel version Upstream-commit: 5ed4386bbf869caf6d39f619e27c5ee1310f879d Component: engine
unclejack
2013-06-27 17:51:17 +03:00
77a309a0dffix panic with unix socket Upstream-commit: 9d3ec7b39fcf178eaa9aa1482f0a85c257df4408 Component: engine
Victor Vieux
2013-06-27 12:57:19 +00:00
edf5c211e8Merge pull request #1019 from dotcloud/1002-change_update_progress_bar_rate-feature
Victor Vieux
2013-06-27 04:19:42 -07:00
b1ef39bb79- Runtime: small bugfixes in external mount-bind integration Upstream-commit: 46a9f29baef77dbe212e1261f5cecbe1b53fadb9 Component: engine
Solomon Hykes
2013-06-26 12:04:55 -07:00
5327febeeb- Fix a few bugs in external mount-bind integration Upstream-commit: 67239957c9e863f16a6d147d88dd2fae00c3770f Component: engine
Gabriel Monroy
2013-06-26 15:43:53 +00:00
1c5ea40b1c* Runtime: better integration of external bind-mounts (run -b) into the volume subsystem (run -v) Upstream-commit: d4e62101abca637b5bc057ec13e73d9ce65d6161 Component: engine
Solomon Hykes
2013-06-24 23:30:48 -07:00
a223caa9e6+ Runtime: mount volumes from a host directory with 'docker run -b' Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621 Component: engine
Gabriel Monroy
2013-05-13 17:39:54 -06:00
7b52085a24Merge pull request #1005 from dotcloud/1004-stdin_piping-fix
Guillaume J. Charmes
2013-06-26 12:56:14 -07:00
167474d709Display containers logs in case of build failure Upstream-commit: 27d67773768222ffc57f124b38c767f36a575f96 Component: engine
Guillaume J. Charmes
2013-06-26 12:50:20 -07:00
09b324ca87Add a script to create the docker-ut image
Louis Opter
2013-06-26 12:35:14 -07:00
ec62c0223fMerge pull request #1021 from errnoh/fix-test-filled-tmpfs
Guillaume J. Charmes
2013-06-26 11:59:06 -07:00
4b6fc4d9a0Merge pull request #1010 from dotcloud/1009-testing-hack
Guillaume J. Charmes
2013-06-25 17:07:18 -07:00
e0c6d66dacBugfixes on docs
Thatcher Peskens
2013-06-25 15:31:22 -07:00
c81eba049aAdd missing fprintf instead of printf Upstream-commit: 6127d757a7495df83b3d4cec53dc56b48c764023 Component: engine
Guillaume J. Charmes
2013-06-25 10:39:11 -07:00
e56adbd4e1TestKill and TestMultipleContainers: run sleep instead of cat /bin/zero. fixes#737 Upstream-commit: fb86dcfb17444089aea31cdf6c9b09c4421731c7 Component: engine
Erno Hopearuoho
2013-06-25 17:52:10 +03:00
f6e7db58bdupdate progressbar every MIN(1%, 512kB) Upstream-commit: bccf06c748c8f62a617a94e8120ce33f2e53183b Component: engine
Victor Vieux
2013-06-25 14:03:15 +00:00
d9bf1bf281Merge branch 'add-daemon-storage-path-param' of https://github.com/heavenlyhash/docker into heavenlyhash-add-daemon-storage-path-param Upstream-commit: 862e223cecec203a96d3be4fd667bc9286703e82 Component: engine
Victor Vieux
2013-06-25 13:26:12 +00:00
796f945ca5Merge pull request #1018 from nahiluhmot/add-swipely-docker-gem
Ken Cochrane
2013-06-25 05:49:52 -07:00
b1a130438cAdded Swipely's docker-api gem to the table of Remote API Client Libraries. Upstream-commit: d03edf12e4ad67f0900434af5c8d36688b6cc2a4 Component: engine
Tom Hulihan
2013-06-25 08:26:41 -04:00
3bc1ecc1faMerge pull request #992 from unclejack/use_numeric_owner_for_tar
Guillaume J. Charmes
2013-06-24 18:40:43 -07:00