Commit Graph

2478 Commits

Author SHA1 Message Date
0c11df3e01 Merge pull request #1267 from sridatta/new-clean-init
* Runtime: Fix to "Inject dockerinit at /.dockerinit"
Upstream-commit: f6fa353dd8be732aaed20f0c64a5ae8ccc9f1dbc
Component: engine
2013-08-05 13:23:22 -07:00
61aee02980 Merge pull request #1411 from andrewmacgregor/doc-typos
Minor typos found while reading docs
Upstream-commit: d4fa619ed1b1b06f7d8dc52c9a0d87a33f6447a3
Component: engine
2013-08-05 13:22:53 -07:00
396e083d45 Merge pull request #1405 from jonasi/entrypoint-noargs
*Runtime: Allow ENTRYPOINT without CMD
Upstream-commit: bdc0e8f82507160d6b00feb00cc5bdb0af95c293
Component: engine
2013-08-05 09:00:39 -07:00
438461c454 Merge pull request #1408 from dotcloud/1407-localhost_is_a_domain-fix
Always consider localhost as a domain name when parsing the FQN repos name
Upstream-commit: 1b08ab92d15765f961cb48fa764e8719a7486baf
Component: engine
2013-08-05 08:50:12 -07:00
c5da071b25 Merge pull request #1382 from monnand/650-http-utils
650 http utils and user agent field
Upstream-commit: feda3db1dd1c76d2866c2a628e28a4999b5b88da
Component: engine
2013-08-05 08:49:12 -07:00
9ddc15ebda Minor typos found while reading docs
Upstream-commit: ce97a71adf879a228f352ee10b7fb62ff86bc4e6
Component: engine
2013-08-05 22:47:16 +08:00
d445832a9e added tests for 1405
Upstream-commit: d00fb4096700cd8feed06ca32c93f080fb6446b1
Component: engine
2013-08-05 09:30:27 -05:00
fe0fe92945 fix entrypoint without cmd
Upstream-commit: 0f249c85ea9acc7fba33994aa5d20a897463db2c
Component: engine
2013-08-05 09:07:03 -05:00
8f44de0140 Merge pull request #1400 from gorsuch/doc-typo
* Documentation: fix a typo in the ubuntu installation guide
Upstream-commit: a37b42b57cd1f372c1583fa3b46b30120401e2ff
Component: engine
2013-08-05 07:05:27 -07:00
bd5fa21461 add docs
Upstream-commit: a97cf23355e661d0336a71b5225ad463efa41297
Component: engine
2013-08-05 11:07:27 +00:00
37bc41c2c0 Merge pull request #1389 from dotcloud/1373-improve_checklocaldns
Consider empty /etc/resolv.conf as local dns + add unit test
Upstream-commit: 030cc8d5cc2df5a8f8f6acb3724c1e6016363d95
Component: engine
2013-08-05 02:29:36 -07:00
193eaad413 Always consider localhost as a domain name when parsing the FQN repos name
Upstream-commit: c22f2617ad8ed2450d4d9dbb6e6ec39da4e51f2f
Component: engine
2013-08-04 17:59:12 -07:00
e591df1e08 typo: s/connexions/connections
Upstream-commit: db0ccaac9b4e9e12d4e33e5d48e437771aaf8dcd
Component: engine
2013-08-03 22:11:59 -05:00
6b62e3168d Merge pull request #1298 from crosbymichael/1246-auth-request
* Registry: Do not require login unless 401 is received on push
Upstream-commit: 4dcc0f316c6dbcad3932b483ad0946a4b7d526cc
Component: engine
2013-08-02 17:39:54 -07:00
3029f070e6 Return JSONError for HTTPResponse error
Upstream-commit: dae585c6e4c19817b2dbd106171728a0bb564ccc
Component: engine
2013-08-03 00:27:58 +00:00
a616b1d2ff Merge pull request #1375 from grobie/patch-1
Move note about officially supported kernel
Upstream-commit: b1d994e3b93280bbe55d208c51e4d9fa712f388f
Component: engine
2013-08-02 17:24:15 -07:00
46b9c95887 Fix TestEnv
Upstream-commit: dde8f74ceae83f26386ec29e42f615fdc7945e80
Component: engine
2013-08-02 15:58:10 -07:00
2a3da65093 Merge pull request #1388 from titanous/revert-vagrant-bind
Revert "Bind daemon to 0.0.0.0 in Vagrant. Fixes #1304"
Upstream-commit: 9e3d18e6068340f673bca79c3703517e0b538e83
Component: engine
2013-08-02 15:26:05 -07:00
71b5dff299 Consider empty /etc/resolv.conf as local dns + add unit test
Upstream-commit: 3e9575e275c40acb04c505fa14c1ac63ba490b75
Component: engine
2013-08-02 15:23:36 -07:00
48643d0043 Revert "Bind daemon to 0.0.0.0 in Vagrant. Fixes #1304"
This reverts commit bdc79ac8b2dfad302f9e144711067a566726cfa2.
Upstream-commit: 07fee445593982ef9063a184c05ba93ecacd2e65
Component: engine
2013-08-02 19:18:02 -03:00
f9de212d00 Merge pull request #1384 from crosbymichael/1326-build-without-cache
* Builder: Add no cache for docker build
Upstream-commit: ead7eb619ed5a60a5ffab62827aa4a3c761504e8
Component: engine
2013-08-02 14:38:34 -07:00
13233c6186 Merge pull request #1350 from ndarilek/1348-add-hostname-to-environment
Runtime: add hostname to environment
Upstream-commit: 29de2432eaf4fdb3d1545693d9c80af4538dbda3
Component: engine
2013-08-02 13:58:43 -07:00
d99bd7febd Merge pull request #1117 from dotcloud/add_last_version-feature
Add last stable version in `docker version`
Upstream-commit: ffcba1236c3ba743b8920c6bf559fe2aa55daf25
Component: engine
2013-08-02 13:53:33 -07:00
b6c9a46ec6 Merge pull request #1336 from dotcloud/fix_ADD_permissions
Builder: Make sure ADD will create everything in 0755
Upstream-commit: 0f088d28c52f9163f1d50336b9da9cf770c955b9
Component: engine
2013-08-02 13:52:19 -07:00
fa165e7be8 Merge pull request #1346 from dotcloud/1117-update_latest_in_dockerbuilder
update http://get.docker.io/latest
Upstream-commit: 16917275ee13c67752f14325cbfe4c3512572654
Component: engine
2013-08-02 13:51:23 -07:00
96cf1ff846 Merge pull request #1343 from dotcloud/ufw_doc
Add ufw doc
Upstream-commit: 09ab2bfa1d7597fbaadef98ce74817152f225365
Component: engine
2013-08-02 13:33:26 -07:00
b7d9cc36c6 Add unit tests for build no cache
Upstream-commit: b9f06959244e3f77eb212c7c234b06eb7b750999
Component: engine
2013-08-02 19:12:38 +00:00
a320ff8945 update auth_test.go
Upstream-commit: 7bade49d4c661c5037de586e6f69291999038ef9
Component: engine
2013-08-02 14:08:16 -04:00
ac12d9b409 Add no cache for docker build
Add a new flag to disable the image cache when building images.
Upstream-commit: 3a123bc479457c4dfa14e39b7c42d9a9dccf8c32
Component: engine
2013-08-02 16:18:54 +00:00
9660113205 factory generated from one place.
Upstream-commit: 5bc344ab73f73a1fb5bea0933a031ad0418cb8f8
Component: engine
2013-08-02 04:10:26 -04:00
1c96da0a53 auth with user agent
Upstream-commit: 4bd287e107eab1623a0e77aeaecda77fc26e7536
Component: engine
2013-08-02 03:30:45 -04:00
4e4b48bb11 Server now use request factory
Upstream-commit: 6a56b7b391ac967540915c2ee8f82b23714ad84c
Component: engine
2013-08-02 03:23:46 -04:00
63124b5509 reqFactory in Registry
Upstream-commit: 7dac26ce69b442d55122caa2897572d3ac8255fa
Component: engine
2013-08-02 03:08:08 -04:00
f137da22a4 http utils
Upstream-commit: 793fd983ef937d2bea1edf5d8d855e2a452a4aa7
Component: engine
2013-08-02 02:47:58 -04:00
da0dfa9ebd Move note about officially supported kernel
It seems this a general note about kernel issues and not specific to Cgroups or namespaces.
Upstream-commit: 2424480e2ce14d848c041c53cc041aab91308081
Component: engine
2013-08-02 12:24:38 +07:00
a4aa2bc965 Merge pull request #1333 from dotcloud/1331-testing-registry
testing, issue #1331: Add registry functional test to docker-ci
Upstream-commit: ea2486d6316b005eb55f8784acfdfd94ed7aba63
Component: engine
2013-08-01 16:00:29 -07:00
0023e3413a Merge pull request #1365 from dhrp/solve-logo-squish
Solved the logo being squished in Safari
Upstream-commit: d1e1a8e78cf7a315bd3083d120220a96663fe5ff
Component: engine
2013-07-31 15:06:26 -07:00
d69f94df65 Solved the logo being squished in Safari
Upstream-commit: e0c24ccfc37b64eb919c5675d8a8f383201fa7cb
Component: engine
2013-07-31 12:17:42 -07:00
6241318046 rebase master
Upstream-commit: 108635582f410c4c767f0e49f4b772a9208e12da
Component: engine
2013-07-31 15:32:08 +00:00
5eea0cead3 Merge pull request #1328 from dotcloud/1307_url_port_delete-fix
Use utils.ParseRepositoryTag instead of strings.Split(name, ":") in server.ImageDelete
Upstream-commit: 0c0077ed6f044f83fff75f2d7a696491fb7fe360
Component: engine
2013-07-31 07:55:06 -07:00
30e6d541d0 Add hostname to the container environment.
Upstream-commit: 9a604acc23d30d00ae907acdf756cbcdf0e4cf83
Component: engine
2013-07-31 09:50:53 -05:00
18178e0bee Merge pull request #1334 from dotcloud/1314-compat_broke-fix
Discard error when loading old container format
Upstream-commit: cd9f7f29d135d0ebe32214696f7bfe2139698a6d
Component: engine
2013-07-31 01:08:08 -07:00
496b0008be fix same issue in api.go
Upstream-commit: a7068510a5ee4af6776221ba00bc332266f97088
Component: engine
2013-07-31 08:01:20 +00:00
e5429eecea improve tests
Upstream-commit: 73c6d9f135493220f034d440d26fedc0242e133a
Component: engine
2013-07-31 07:56:53 +00:00
7aa4663949 Return registy status code in error
Added Details map to the JSONMessage
Upstream-commit: 3043c2641990d94298c6377b7ef14709263a4709
Component: engine
2013-07-30 23:24:31 +00:00
554c357a3e update http://get.docker.io/latest
Upstream-commit: e66e0289abc213164dca1e1eadfb0380b6e81904
Component: engine
2013-07-30 17:18:19 +00:00
c7d245ec6d Add check that the request is good
Upstream-commit: e4752c8c1a09fc3cc96dbb9be7183b271db3d6b7
Component: engine
2013-07-30 16:42:32 +00:00
ccc9b252b2 Merge branch 'master' into add_last_version-feature
Upstream-commit: 99c27fa0ddf6db7eb8a1b9484ea6ad19c0b2e4f5
Component: engine
2013-07-30 16:23:06 +00:00
6c28901fdb fix tests about refactor checksums
Upstream-commit: b14c251862021b2bc82aa8e0146e5e5e80f1c713
Component: engine
2013-07-30 13:13:18 +00:00
eac2c76be1 Merge pull request #1268 from dotcloud/refactor_checksum
Refactor checksum
Upstream-commit: bcd6ca368556c329063d58c32945753f783adc75
Component: engine
2013-07-30 06:07:54 -07:00