Commit Graph

460 Commits

Author SHA1 Message Date
c8bc9a992c Fixed tag option for "docker pull" (the option was ignored)
Upstream-commit: cd0fef633c5d871b192146e405ca7c5bebb2f3ba
Component: engine
2013-07-12 10:42:54 -07:00
5d09c440fb Merge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature
* Client: Add options to docker login to be able to use it via script
Upstream-commit: 752f99e8a18a5e16f2a93b0fac1984b3a4412346
Component: engine
2013-07-12 05:07:25 -07:00
a1035172cd Merge pull request #1192 from dotcloud/docker_port-fix
hotfix: fix broken docker port
Upstream-commit: 8ff271fc742f21c4532f469e06e9f48498f23e8e
Component: engine
2013-07-12 04:57:53 -07:00
c22c23bfc2 Merge branch 'master' into list_container_processes-feature
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
5d58cdd260 change output
Upstream-commit: 976428f505b64a51efbd97f71acff5db2f4f5ed0
Component: engine
2013-07-11 21:04:23 +02:00
ba109b6d9a fix broken docker port
Upstream-commit: affe7caf78288a638df3db37d5cebb4dc7f9ff72
Component: engine
2013-07-11 19:28:15 +02:00
e783956d16 Fixing missing tag field when pulling containers which does not exist
Upstream-commit: 59b785a2820e9ff07ce2a71c83eef8b6ccc467cc
Component: engine
2013-07-09 16:45:32 -07:00
9f779bc589 Merge branch 'master' of github.com:dotcloud/docker into standalone_registry
Upstream-commit: 837be914ca96c1f03d835a7b834693be16ce7043
Component: engine
2013-07-09 11:31:14 -07:00
44da1d38e6 Merge pull request #1049 from dotcloud/1040_ignore_stderr_tests-fix
- Tests: Ignore stderr while doing tests
Upstream-commit: ada0e1fb0817d2e609b46c260ef6ab0cfa510379
Component: engine
2013-07-09 10:32:24 -07:00
13a18e3d5d Moved parseRepositoryTag to the utils package
Upstream-commit: 019324015b0c64733ae4f39708aa49a08134cb48
Component: engine
2013-07-09 08:06:10 -07:00
80e25aa274 fix typo
Upstream-commit: 05d7f85af9e5813ddb1c066e44c802dc33790547
Component: engine
2013-07-09 10:55:28 +00:00
a1649836a4 Changed the tag parsing to it will work even if there is a port in the repos registry url (full qualified name for pushing on a standalone registry)
Upstream-commit: 3e8626c4a171653971aebcb778087c89c6c7ab67
Component: engine
2013-07-08 17:20:41 -07:00
92dc376485 add if to prevent crash
Upstream-commit: 3a20e4e15d27ab0061e5ffb427baf7162de9add9
Component: engine
2013-07-08 18:19:12 +00:00
5449f8eee9 uses the terminal size to display search output, add -notrunc and fix bug in resize
Upstream-commit: fd97190ee752c8de38be38a03f3cfdd4b4ce1460
Component: engine
2013-07-08 17:20:13 +00:00
bf4fc24d05 Merging from master
Upstream-commit: be49f0a1182164d0d279484ec35931c1e3ef6d3c
Component: engine
2013-07-05 12:27:10 -07:00
057f0a4b6f Adding support for nicer URLs to support standalone registry (+ some registry code cleaning)
Upstream-commit: 66a9d06d9fa7a382c6852cf047e1448e0d3e1782
Component: engine
2013-07-05 12:20:58 -07:00
1c71d0a65e Implement several golint suggestions, including:
* Removing type declarations where they're inferred
* Changing Url -> URL, Id -> ID in names
* Fixing snake-case names
Upstream-commit: 19121c16d9514b391ce8f15aeff3c47c1ea5a841
Component: engine
2013-07-03 14:36:04 -07:00
8b7816d5d5 Bump version to 0.4.8
Upstream-commit: 96a1d7c6455b5b4326469f9a51bee869883aac3c
Component: engine
2013-07-01 16:58:25 -07:00
f8f9a4db66 Merge pull request #1046 from dotcloud/1043-output_id_non_attach-fix
- Runtime: Make sure the ID is displayed usgin run -d
Upstream-commit: 79ee8b46f449aaa0770e16be6af5e1ea8b77a1cc
Component: engine
2013-07-01 16:49:43 -07:00
ab729772a8 change to top
Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c
Component: engine
2013-07-01 15:19:42 +00:00
4b2d50c5e8 rebase master
Upstream-commit: 3b5ad44647bf4033502594a4048bffea656b2a08
Component: engine
2013-07-01 12:31:16 +00:00
4240b58553 Bump version to 0.4.7
Upstream-commit: ca497a82abfe92f2dbe1a7e161dc7ff19eefeec4
Component: engine
2013-06-29 21:12:29 -07:00
0081ddc545 Allow push by ID when using a custom registry
Upstream-commit: e095a1572fb8a2ba17ea231abcb3704cf83a96e4
Component: engine
2013-06-28 18:19:58 +02:00
6657ec16bd add /proc to list running processes inside a container
Upstream-commit: 2e79719622964eb95eca70372ced0ad6e4dce4f5
Component: engine
2013-06-28 15:51:58 +00:00
ad4f82e6d2 Merge pull request #1032 from andrewsmedina/govet
following the 'go vet' suggestions for the docker package.
Upstream-commit: a11fc9f067d898e3dd6a43e9841e2ea85842af2b
Component: engine
2013-06-28 05:27:53 -07:00
65b2fd1698 Ignore stderr while doing tests
Upstream-commit: 800d9006883228365a375800254871397cb1a011
Component: engine
2013-06-27 15:25:31 -07:00
13ee8793a9 Make sure the ID is displayed usgin run -d
Upstream-commit: bd144a64f652895a41b67464a426839ef79d73dc
Component: engine
2013-06-27 12:48:25 -07:00
77a309a0df fix panic with unix socket
Upstream-commit: 9d3ec7b39fcf178eaa9aa1482f0a85c257df4408
Component: engine
2013-06-27 12:57:19 +00:00
e593de79dc following the 'go vet' suggestions.
Upstream-commit: 3d5633a0a0eb98bbd833e760279720a15ced8b58
Component: engine
2013-06-27 01:33:55 -03:00
a223caa9e6 + Runtime: mount volumes from a host directory with 'docker run -b'
Upstream-commit: 4fdf11b2e62bf7d785a958afd4fc5b8cfc32f621
Component: engine
2013-06-26 15:07:31 -07:00
c81eba049a Add missing fprintf instead of printf
Upstream-commit: 6127d757a7495df83b3d4cec53dc56b48c764023
Component: engine
2013-06-25 10:39:11 -07:00
51f8e07a39 Implement regression test for stdin attach
Upstream-commit: 5190f7f33a9e36f1f5991a385f4db198e9f1b3a6
Component: engine
2013-06-24 18:36:04 -07:00
38132ab186 Make NewDockerCli handle terminal
Upstream-commit: 873a5aa8e72102a31f34c62603a3f5976471e94a
Component: engine
2013-06-24 18:29:08 -07:00
9e3102fd11 Make term function consistent with each other
Upstream-commit: 672d3a6c6cd0494a0b8eaa13674c3cb87cba029c
Component: engine
2013-06-24 18:27:57 -07:00
40e51bbd8c Make DockerCli use its own stdin/out/err instead of the os.Std*
Upstream-commit: a749fb21309b147a1bb9da0838f591ba58f6d169
Component: engine
2013-06-24 18:27:57 -07:00
1553a048ac Fix issue when attaching stdin alone
Upstream-commit: 25d1bc2c09e3f6e7973d6b159e49ae7f8bd7670d
Component: engine
2013-06-24 18:27:57 -07:00
58d29f2b8c Bump version to 0.4.6
Upstream-commit: 9fe8bfb2bc4b00a69db16e04e45c065090d1af2d
Component: engine
2013-06-22 13:36:45 -07:00
9a274aa9bd fix raw terminal
Upstream-commit: ec6b35240ed19aa68e4295c9211aa13a7e37efad
Component: engine
2013-06-22 00:37:02 +00:00
9532506c90 Merge pull request #986 from dotcloud/bump_0.4.5
Bump version to 0.4.5
Upstream-commit: c792c0a6c9e110c082e61022cd53b725f150b410
Component: engine
2013-06-21 17:13:38 -07:00
ddee279309 Bump version to 0.4.5
Upstream-commit: f5d08fc49c48cda7fdce613a1cef57ed2b105abd
Component: engine
2013-06-21 17:01:01 -07:00
3f92ee019d merge master and add doc
Upstream-commit: 4d1692726b5e7cfc1b58245afc48c1591724369f
Component: engine
2013-06-22 01:08:20 +02:00
9d597b11de Merge pull request #848 from dotcloud/builder_server-3
Improve Docker build
Upstream-commit: de1a5a75cc5ae9d1084885d810d5715ee900f16d
Component: engine
2013-06-21 14:55:08 -07:00
fa5ff73c73 add options to docker login
Upstream-commit: 42bcfcc927499c63bbc3e3de80e6f52fd02fc9e8
Component: engine
2013-06-21 10:00:25 +00:00
32f89c6b42 Merge branch 'master' into fix-auth
Upstream-commit: 8f2a80804ce6f3ab77057a25180a27e3b346778b
Component: engine
2013-06-21 09:18:03 +00:00
7c517d635a Merge branch 'simpler-build-upload' (#900) into builder_server-3 (#848)
Upstream-commit: 352991bdf4c0a7702fcc791b961a516fb684f4c1
Component: engine
2013-06-20 22:02:36 -07:00
c29f5f7d2f Merge branch 'master' into simpler-build-upload
Conflicts:
	commands.go
Upstream-commit: 86e83186b5826e9ff4b11d3425a31a72a7535ea0
Component: engine
2013-06-20 20:25:59 -07:00
5f45c865b5 Use hijack for logs instead of stream
Upstream-commit: b419699ab8f79f4826ec94583c6f7a46f74eeaa2
Component: engine
2013-06-20 18:18:36 -07:00
37052c0a21 Bump version to 0.4.4
Upstream-commit: 02f0c1e46d1d73677aed899c1f0deaa69ab11ffc
Component: engine
2013-06-20 14:33:59 -07:00
931d03178d - Builder: hotfix for bug introduced in 3adf9ce04ef1632f82f7bd1585c135bb141aa450
Upstream-commit: dbfb3eb92391d90741be3238551a0fffcf2dbcdc
Component: engine
2013-06-20 14:29:34 -07:00
a4e9bba7a3 Merge branch 'master' into simpler-build-upload
Conflicts:
	api.go
	builder_client.go
	commands.go
Upstream-commit: e43323221b15d90956a200754bbf3e1d92d7bb1c
Component: engine
2013-06-20 14:19:09 -07:00