Commit Graph

559 Commits

Author SHA1 Message Date
526943dce0 Merge remote-tracking branch 'upstream/master'
Upstream-commit: 4c19c9341c988b9b224e98489dc30b8b405d4b33
Component: engine
2013-03-25 19:41:24 +00:00
e38328aa33 Merge pull request #154 from dotcloud/153-commitnorepo
Clearer information when listing images
Upstream-commit: 222c04a7e71a19491559cc81c6541f7474755400
Component: engine
2013-03-25 12:04:57 -07:00
f341fe66df Merge remote-tracking branch 'upstream/master'
Upstream-commit: fcdfd696ec089ad412a47c88c05a61d7257a478d
Component: engine
2013-03-25 18:24:45 +00:00
9aac936e9c Fixed issue #158 (docker crashes when docker run is called with not enough arguments)
Upstream-commit: c8ca50b48328448d70c3f227dc7bb8d65a980f6b
Component: engine
2013-03-25 07:17:11 -07:00
da48e2fe16 Merge branch 'master' of github.com:dotcloud/docker
Upstream-commit: a61e68275a62c301917044b4cdc6e12d26c27dd4
Component: engine
2013-03-25 01:29:09 -07:00
1eacf7201c Improve the debug function
Upstream-commit: 6576b19a28a688f00dbe21318b4073826001cf3c
Component: engine
2013-03-25 01:29:01 -07:00
ed7e1e2dda Merge pull request #152 from srid/patch-1
`docker import` doesn't download an image
Upstream-commit: ceb66fd035055e4942d05f483a154039b45f5f22
Component: engine
2013-03-24 16:58:35 -07:00
48f5bf0f6a Merge pull request #155 from sa2ajj/debian-control-fix
fix run-time dependency
Upstream-commit: 22598ee572d08ed4bfae2242519acea31124c00c
Component: engine
2013-03-24 16:54:01 -07:00
89c85c64a6 Merge pull request #147 from dotcloud/146_autologin-feature
#146 Auto login on push
Upstream-commit: 52969416bc2500cd986f593b85f9e1589f9e1f9c
Component: engine
2013-03-24 16:52:50 -07:00
da30b59362 fix run-time dependency
Upstream-commit: c61172f9c2e30ab70f512efdf699319da855f864
Component: engine
2013-03-25 01:36:59 +02:00
d85e328966 Show <none> instead of an empty string in docker images listing for images with no repository or tag
Upstream-commit: 0786d9ec22164afe17051e69dd462ebee6ddcbf9
Component: engine
2013-03-24 15:01:41 -07:00
2f936aecff Reverted previous change
Upstream-commit: 938bf4c9019cf6b5f64ebcc6db782d858feac2fb
Component: engine
2013-03-24 14:53:00 -07:00
fcd701c7ea Quick fix to avoid creating empty-string repositories when committing
Upstream-commit: 87d4e16568f151cc7dc0f10b8c3f222024582489
Component: engine
2013-03-24 14:38:10 -07:00
71b8d68708 docker import doesn't download an image
```
$ docker import base
Downloading from http://base
Error: Get http://base: lookup base: no such host
```
only `docker pull` does:

```
$ docker pull base
Pulling base...
Pulling repo: https://registry.docker.io/v1/users/base
Pull completed
```
Upstream-commit: 55c89087561e98eb2d4ce46b9d65c4e31f9297d8
Component: engine
2013-03-24 14:13:08 -07:00
b293dc1722 Merge pull request #138 from srid/handle-port-mapper-error
handle errors during the creation of port mapper
Upstream-commit: 51455b1ee0f120d20d511e3f76786b9d688ceeff
Component: engine
2013-03-24 10:27:03 -07:00
ba389f9231 Merge pull request #143 from dotcloud/141-142_update_help-fix
141 142 update help fix
Upstream-commit: 906626b8f8524ed52fb48f9aebf11c108b84ad0f
Component: engine
2013-03-24 07:07:24 -07:00
b8061a28b7 Fix missing group "Vagrant" error
Upstream-commit: 94b9ca988de6970406789759b5f75fee19fd5dbb
Component: engine
2013-03-24 10:49:16 +00:00
21b7825620 Merge remote-tracking branch 'amesserl/raxcloud-support'
Conflicts:
	Vagrantfile
Upstream-commit: bea7894166ad879a290650f8fa1ab06f9ca3cdb5
Component: engine
2013-03-24 10:16:50 +00:00
90c93380c4 Remove json alteration
Upstream-commit: e09383bccfcefa3699aa959dedbd8364d505bf9c
Component: engine
2013-03-23 14:54:18 -07:00
450d1a6d33 handle errors during the creation of port mapper
example:

  2013/03/22 21:42:55 Unable to setup port networking: Failed to create DOCKER chain

  (which was possibly introduced by commit 3c6b8bb88)
Upstream-commit: 371225520fc86fa58fadd182730b958a0f7ef9ab
Component: engine
2013-03-22 21:44:01 -07:00
bd718edb46 #146 Auto login on push
Upstream-commit: eb95e4915089c90dba8939c05825d2b5f5eed8e4
Component: engine
2013-03-22 19:04:12 -07:00
ad69580c89 Allow anonymous pulls
Upstream-commit: 96010e3ca134acb4707bbbb1fd8649d7de671229
Component: engine
2013-03-22 18:46:47 -07:00
341f5cd409 Merge pull request #145 from dotcloud/144-login_daemon_mode-fix
Login now works with daemon mode
Upstream-commit: e55b8b2fd9e6e2a4d8db50cde01a462918c76a33
Component: engine
2013-03-23 20:30:19 -07:00
e403584f6d Login now works with daemon mode
Upstream-commit: ffe5370e35d7eda627894a4510095dca26bdbbca
Component: engine
2013-03-22 18:37:53 -07:00
627e636209 #142 Change the help for push and pull in order for it to be more clear
Upstream-commit: df19863b23665daa056f5882676e6416e5a65e9e
Component: engine
2013-03-22 18:17:49 -07:00
328fcdbdb4 #141 Update and order the help
Upstream-commit: cb3c4af404e29e03e9971df62625cf9d90467ca6
Component: engine
2013-03-22 18:15:44 -07:00
189f87f526 Merge branch 'no_root_repo_push'
Upstream-commit: bd2a55cd2680b127c426c57204161bc0e2679f03
Component: engine
2013-03-22 17:58:34 -07:00
1a02694099 Forbid users to push "root" repositories
Upstream-commit: b370acd679622239849b1dfbe05d61804aeb7162
Component: engine
2013-03-22 17:58:00 -07:00
f375f50cbd Implement the "library" repository endpoint on the registry
Upstream-commit: 5c04d3488a0c02426ea08dcd9b1ead5884062836
Component: engine
2013-03-22 17:43:11 -07:00
d64409ad42 'docker commit -m': optional commit message
Upstream-commit: 0d46ddf7b4940f7e9b1cecf00a9f608134cdbac8
Component: engine
2013-03-23 19:16:42 -07:00
ef4eef944a Clean up 'container' environment variable injected by lxc-start
Upstream-commit: f7eaaa3adb08082089544c34439bb31b5a6f3246
Component: engine
2013-03-23 19:11:00 -07:00
488f905ca6 Bumped version to 0.1.0
Upstream-commit: 57e2126a02f8b96b0542df7f6a573233d8419bb1
Component: engine
2013-03-23 17:48:18 -07:00
723438ed65 Merge branch 'graph'
Upstream-commit: 5130d3d6ec979ea2d1f9a0da9d5766028571dd9e
Component: engine
2013-03-23 17:47:33 -07:00
47526e3d69 Merge branch 'graph' of http://github.com/dotcloud/docker into graph
Upstream-commit: 587debf92e3d83ca97df6826a496506a760374cd
Component: engine
2013-03-23 17:04:37 -07:00
f7f37b2e1a 'docker images' doesn't show all anonymous images by default - only anonymous heads
Upstream-commit: d301c7b98c46fa0d1bba66be852a7453d108f028
Component: engine
2013-03-23 17:03:30 -07:00
83b43f1105 No more dependency on sqlite
Upstream-commit: f43fbda2a464ba2ef26c88c25cdb933c144657f4
Component: engine
2013-03-23 16:17:01 -07:00
8664639f32 Properly cleanup iptables rules inserted in OUTPUT (introduced in 3c6b8bb8882fcd2083d1c489df3cc40062b4896c)
Upstream-commit: 301a8afff578a8467e98f1081aa96323c458e1f1
Component: engine
2013-03-22 22:31:20 -07:00
3d900a70b6 Merge pull request #133 from shawnsi/master
Vagrant Provision Touch Up
Upstream-commit: 690cae0ef442301a97546f953dfdc8b661f3d9ef
Component: engine
2013-03-22 15:11:52 -07:00
9fd966c650 Merge pull request #124 from donspaulding/master
Fix typos in the README
Upstream-commit: 936bd87a5217d43a0668787aadd61e40f5aa6159
Component: engine
2013-03-22 15:10:13 -07:00
e548f7cc97 Remove the json alterations when decoding
Upstream-commit: dc2d930520cd528129330098e868c7fffe8349b9
Component: engine
2013-03-22 14:27:10 -07:00
c21329b657 Add some verbosity to the push/pull
Upstream-commit: 966cddf26bc5e86c47faab0ddc69b42e9bd8a9f2
Component: engine
2013-03-22 13:21:44 -07:00
b66de65be9 Merge branch 'graph' of github.com:dotcloud/docker into graph
Upstream-commit: 6e35f283524a866c71aefee417fdd414182e6772
Component: engine
2013-03-22 13:10:31 -07:00
495926123e An image embeds the configuration of its parent container ('ContainerConfig')
Upstream-commit: 0146c80c40fa5b793fdda17ed2c96d49bd90e2ed
Component: engine
2013-03-23 14:48:16 -07:00
77ad2413d9 Merge branch 'graph' of ssh://github.com/dotcloud/docker into graph
Upstream-commit: b809dc4271ee0f9ea5d20fc92fcb6cc62c6fca8d
Component: engine
2013-03-23 14:18:41 -07:00
500d4f159a Fixed 'docker inspect' to exit silently when an image doesn't exist
Upstream-commit: f37c432bd5fc40ee45b5d31ea750c59c544f2df5
Component: engine
2013-03-23 14:18:35 -07:00
0a65e82434 Merge branch 'graph' of ssh://github.com/dotcloud/docker into graph
Upstream-commit: d9471bee3da16f7cef1f7bf5d7d1b202514a1f3d
Component: engine
2013-03-23 12:39:36 -07:00
6ae0955c01 Moved image name into config. runtime.Create() now receives a single Config parameter
Upstream-commit: 6ce64e8458b31aff150f2cae197d42e334018afa
Component: engine
2013-03-23 12:39:09 -07:00
3eb293999e runtime.Create receives an image name + Config. The Config includes all required runtime information: command, environment, ports etc.
Upstream-commit: 031f91df1a158d37f7f068ca1e17c25e1f112f29
Component: engine
2013-03-23 12:16:58 -07:00
5c11981229 Remove the lookup before pushing
Upstream-commit: 89763bc8af81dcda3d9989cf6687c75101bbd9bc
Component: engine
2013-03-22 13:10:17 -07:00
71cb06de21 Add a Debugf() helper and a -D (debug) flag to docker
Upstream-commit: 6e507b9460b81e830ef2f5d10035d08e3948fe4d
Component: engine
2013-03-22 11:44:12 -07:00