Commit Graph

2460 Commits

Author SHA1 Message Date
486c942e2b Exit if there is any error reading from stdin.
Upstream-commit: 4089a20cf476d2241b051d9ba913b7adde90661d
Component: engine
2013-08-03 17:27:15 -07:00
7656c6dc55 Stop making a raw terminal to ask for registry login credentials.
It only disables echo asking for the password and lets the terminal to handle everything else.
It fixes #1392 since blank spaces are not discarded as they did before.
It also cleans the login code a little bit to improve readability.
Upstream-commit: 75ac50a9a0669b464a95e069e66da5d47df9182f
Component: engine
2013-08-03 16:43:20 -07:00
b4b1066319 Merge branch 'master' into login_signal
* master: (54 commits)
  Return JSONError for HTTPResponse error
  Fix TestEnv
  Revert "Bind daemon to 0.0.0.0 in Vagrant. Fixes #1304"
  Add unit tests for build no cache
  Add no cache for docker build
  Move note about officially supported kernel
  Solved the logo being squished in Safari
  Add hostname to the container environment.
  fix same issue in api.go
  improve tests
  Return registy status code in error
  update http://get.docker.io/latest
  Add check that the request is good
  fix tests about refactor checksums
  add ufw doc
  Fixed a couple of minor syntax errors.
  Updated the description of run -d
  Make sure the index also receives the checksums
  Switch json/payload order
  Remove unused parameter
  ...
Upstream-commit: 58e0c68132ba59ac79f403e46b232a16cd5f0a8c
Component: engine
2013-08-03 15:43:43 -07: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
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
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
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
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
19f5597185 Merge pull request #1291 from dotcloud/ensure_mount_commit
*Builder: Allow the commit of a non-started container
Upstream-commit: 16225c473f2c999ce3e9a13c4c8e02502a9a841c
Component: engine
2013-07-30 05:19:17 -07:00
d8352677c8 Merge branch 'master' into 1237-improve_docker_top-feature
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
fb6e560276 add ufw doc
Upstream-commit: 7d0b8c726c0d178291063751ac735d6caebfb45a
Component: engine
2013-07-30 13:47:29 +02:00
091d56f759 Merge pull request #1342 from dsissitka/patch-4
Fixed a couple of minor syntax errors.
Upstream-commit: f2dc49292f775f4c10fc61157cac0b8e15315917
Component: engine
2013-07-30 04:20:05 -07:00
b5c161efba Merge pull request #1339 from dhrp/docker-run-d-description
Updated the description of run -d
Upstream-commit: a7ace535c36905b85af3cc3f57beb910ed9efb32
Component: engine
2013-07-30 04:15:41 -07:00
915bf69673 Merge branch 'cleanup_signal_handling' of https://github.com/calavera/docker into calavera-cleanup_signal_handling
Upstream-commit: c99e8de5a4faeb6c3d696790cc300a88f8e96855
Component: engine
2013-07-30 11:14:36 +00:00
5b5037b593 Merge pull request #1306 from dotcloud/1294_fix_wrong_untag_using_id_rmi
Fix wrong untag using id rmi
Upstream-commit: c06aa62bdaa92df5c58d0ca5deb54b1ca66f3ba5
Component: engine
2013-07-30 04:09:55 -07:00
86d430ea32 Fixed a couple of minor syntax errors.
Upstream-commit: 9ba998312de5826f24f693c8518ecda700135b4b
Component: engine
2013-07-30 01:39:29 -04:00
54cdb0b99a Merge pull request #1209 from zimbatm/upstart-improvements
Upstart improvements
Upstream-commit: 7d68afb2d28b59757b953446c1c6a0df3c2174ec
Component: engine
2013-07-29 18:28:40 -07:00
ac3069fde6 Merge pull request #1312 from titanous/vagrant-bind
Bind daemon to 0.0.0.0 in Vagrant
Upstream-commit: bfdf1839e07c0dfb54f5258ede0ccb94a16f4d08
Component: engine
2013-07-29 17:06:37 -07:00
7e99f4ac78 Updated the description of run -d
The goal is to make it more clear this will give you the container id after run completes.

Since stdout is now standard on run, "docker run -d" is the best (or only) way to get the container ID returned from docker after a plain run, but the description (help) does not hint any such thing.
Upstream-commit: 5dc86d7bca17c2996264a18cc26f06d30e532588
Component: engine
2013-07-29 14:17:15 -07:00
0864f56735 Merge pull request #1233 from fmd/1136-environment-variables
+ Builder: CmdAdd and CmdEnv now respect Dockerfile-set ENV variables
Upstream-commit: f35491190a91fb078cb1e5b3319434a6acfa024e
Component: engine
2013-07-29 13:43:13 -07:00
753746a54d Make sure the index also receives the checksums
Upstream-commit: 5b27652ac6eaf1bc4c2a16e51919ec4272a58fd6
Component: engine
2013-07-29 11:30:21 -07:00
0e6bb26f77 Switch json/payload order
Upstream-commit: 394941b6b0a30fecf8ae7b6de5880fa553141f93
Component: engine
2013-07-29 11:30:17 -07:00
c364da0b51 Remove unused parameter
Upstream-commit: 0f134b4bf81a4d0160932852854b190b7ee7e3b9
Component: engine
2013-07-29 11:30:17 -07:00
78c57a64f0 Refactor the image size storage
Upstream-commit: 0badda9f1587c11a13dca17c68b30addd757237c
Component: engine
2013-07-29 11:30:17 -07:00
0d6f4c9ed4 Handle extra-paremeter within checksum calculations
Upstream-commit: e3f68b22d8f0635a8c08ab56721e56dbe570a49a
Component: engine
2013-07-29 11:30:17 -07:00
e9895c9839 Refactor checksum
Upstream-commit: 8ca7b0646e6c4346075656f46847f53c2e868a3d
Component: engine
2013-07-29 11:30:17 -07:00