06d0a8ebde
Merge pull request #5827 from vieux/fix_multiple_events_on_same_computer
...
allow 2 docker events to be opened on the same computer over unix socket
Upstream-commit: 9e7757a3d25947d5ef8f8882baae0bacd6fb1f49
Component: engine
2014-05-16 18:17:46 -07:00
ed8430a340
Merge pull request #5571 from vieux/fix_race_docker_daemon
...
Fix race docker daemon
Upstream-commit: 00ce30bc7473b389579a44e55a01c818ebae84e1
Component: engine
2014-05-16 13:57:43 -07:00
3e603cbd49
run: pull only latest when no tag specified
...
This makes Docker pull only the image tagged as latest when no tag has
been specified. This makes Docker pull only the image it'll run.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: b8e338144e90a6bb76110ab04cc216966640a3f4
Component: engine
2014-05-16 15:23:47 +03:00
e1b6815b39
allow 2 docker events to be opened on the same computer over unix socket
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 81ffd6530aced5237c01bd13e80686da68de6637
Component: engine
2014-05-15 23:27:36 +00:00
24c85b9176
Merge pull request #5706 from vieux/remove_add_string
...
Upstream-commit: 8d213e91b3ef0ed77d43ec20d378be01dfe7ed5c
Component: engine
2014-05-14 17:31:52 -07:00
2b662e5ee6
Merge pull request #5752 from crosbymichael/fix-port-mapping-ps
...
Fix port mapping in ps display for public and private
Upstream-commit: d066ceaa4f2d27f9d8baea56498934f8b57d5de7
Component: engine
2014-05-14 11:36:23 -07:00
aba2e9f1f5
move acceptconnections as builtin
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 937f8f2d813f58480e4bb2c0060353be31b04e10
Component: engine
2014-05-13 01:53:38 +00:00
cb8e10ccdc
make listen buffer optional
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: f3736265fdddef9e9a9ab588906eeb7abe8a0cf6
Component: engine
2014-05-13 01:51:41 +00:00
d39f282a2b
Move duration and size to units pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d33b4655c4339dcbbf9f78948598e216ac3c06b4
Component: engine
2014-05-12 17:05:07 -07:00
cbbfe1274a
Fix port mapping in ps display for public and private
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d54dec4d8b6f36fa9211e7a3379f7e949c40b0ce
Component: engine
2014-05-12 15:26:23 -07:00
cc0e75c911
remove addString and replace Tail
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: e304e3a6624e740159e99e83d6d13f0a3cdfeb49
Component: engine
2014-05-09 18:09:59 +00:00
90fcda8544
rename goruntime import to runtime
...
This renames the goruntime import of the runtime package back to
runtime.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 4c2b9d732446adb472667c2a7017ba3e8cc58c0d
Component: engine
2014-05-09 10:14:37 +03:00
fda92cf483
Revert "refactor build job to know only configFile"
...
This reverts commit b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db.
Conflicts:
server/server.go
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 2aff119baa15cff37f9b2004755f144f16a87801
Component: engine
2014-05-07 22:59:13 +00:00
f18c414a67
Revert "rename configFile to auth in the job"
...
This reverts commit e9c3e397436221528312c0d3b291ae5a12862ed2.
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 331e77f9ed938b3a8c7346ef46a9f6f5cd2dc794
Component: engine
2014-05-07 22:58:09 +00:00
1812682982
Merge pull request #5544 from vieux/cleanup_api_client
...
Cleanup api client
Upstream-commit: 34e09afa24503e03d74f93f110ce752c38f39071
Component: engine
2014-05-05 11:16:57 -07:00
eebd02a00b
Merge pull request #5569 from vieux/add__ping_to_the_API
...
Add ping to the api
Upstream-commit: f369278725a2c31f5fa2ba2da33ad513f54a5897
Component: engine
2014-05-05 10:09:31 -07:00
f8cb02bd82
api/server: better error checking to avoid unnecessary panics
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: f37ce76bf68d4935accd1018c904e80e42066f9f
Component: engine
2014-05-02 16:03:37 -07:00
18e1876580
return write error
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: c65de2c0207ac67e5023ada8709490ef4627bd01
Component: engine
2014-05-02 22:03:59 +00:00
11bde7fe02
add _ping endpoint
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: cf0076b92dd11b3bda9ac7982e374d4531925ff9
Component: engine
2014-05-02 21:43:51 +00:00
1095c42f89
fix https
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 45be6f6dff1a8be328e5ade008aae8f9062f5cef
Component: engine
2014-05-02 19:49:12 +00:00
69ddc0b4e4
move hijack to it's own file
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 8c9192cd76ad46bda3d0ec5ba7eb4a30669afb40
Component: engine
2014-05-02 17:45:58 +00:00
58cd3a6a1e
remove when httputil.NewClientConn when not in hijack
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 314bd02d2ccd7ab59b67d02a53669028695dd3bc
Component: engine
2014-05-02 00:25:10 +00:00
6a260a1e42
Timestamps for docker logs.
...
Fixes #1165
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: d1297feef8b124e69efc99a58294f498ecb8c022
Component: engine
2014-05-01 20:40:36 +04:00
d8eb119f29
Remove error from engine.New()
...
Without creating a root there is no way for the engine to return an
error from the new function.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7100ace42bda2660d1eaecb2ec096ba6753688ea
Component: engine
2014-04-23 11:54:35 -07:00
e886c73325
Update tests with engine root removal
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 87e8d7754e218d93b480b94537d07793f6680515
Component: engine
2014-04-22 19:24:47 -07:00
51ab1031ea
rename configFile to auth in the job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e9c3e397436221528312c0d3b291ae5a12862ed2
Component: engine
2014-04-14 17:15:22 +00:00
f3aecbde7d
refactor build job to know only configFile
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db
Component: engine
2014-04-10 22:29:03 +00:00
a6fc08c279
Merge pull request #4821 from jimenez/3903-add_event_end_timestamp-feature
...
Adding timestamp end to events endpoint. Modifying api docs.
Upstream-commit: a521388863502014bdea80585b7272a854191244
Component: engine
2014-04-10 20:54:53 +03:00
825d583586
Adding timestamp end to events endpoint. Modifying api docs.
...
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com > (github: jimenez)
Upstream-commit: 66dd4ea4e280e4acc133872401bf8a79c80510f3
Component: engine
2014-04-10 10:43:21 -07:00
39daf771d4
Make remote API unit tests easier to read and write
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 1e6f21dc9e7b172b28d364741abb92540938c51a
Component: engine
2014-04-08 18:14:47 -07:00
fbd324c9f0
remove double deprecation warning
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 9260c06f7a7cb172205dc45af96870ec0d02ebcd
Component: engine
2014-04-08 20:58:19 +00:00
904747ba78
Early deprecation warning for 'docker commit --run'
...
Warn users of the planned deprecation of 'docker commit --run', and hide
it from the docs and usage message. The option continues to work.
Note that an alternative to 'commit --run' is being implemented but is
not yet available. We are printing the warning anyway because on
the basis that it never hurts to give more advance warning.
The 'commit --run' flag is a leftover from the very early days of Docker,
and has several problems:
1) It is very user unfriendly. You have to pass a literal json dict
which is poorly documented and changes regularly (see PortSpecs vs
ExposedPorts). The merge behavior is not clear and also changes
regularly. it's not possible to unset a value.
2) It overlaps with the Dockerfile syntax. There are 2 ways to set
a default command, expose a port or change an env variable. Some
things can be done in a Dockerfile but not in --run. Some things
can be done in --run but not in a Dockerfile. It would be better
to push a single syntax, allow using it both in a file and via
the command line, and make improvements in a single place.
3) It exposes data structures which should not be publicly exposed.
There are several planned improvements to Docker which require moving
around the content and schema of the various Config, Image and Container
structures. The less of those we expose in public interfaces, the easier
it is to move things around without a reverse compatibility nightmare.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 168f8aba74d9c2996acec6fe1b93a2301523e305
Component: engine
2014-04-08 12:10:47 -07:00
dbddde5f2d
intermediate image layers are used for more than the build
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 87ea27e80b131ca11d74c89446d4992af0f6c5b9
Component: engine
2014-04-07 18:37:52 +10:00
0f551f19fb
Use setjson hack again for version
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 4c6cf9e27fd0ee6c09e836f03722d1c679b6bd29
Component: engine
2014-04-04 11:37:08 -07:00
bc3cbf9f38
Merge pull request #5005 from shykes/deprecate-insert
...
Deprecate 'docker insert'
Upstream-commit: 09aa28eca049320f53300f9d7ba9bc28c1033d3b
Component: engine
2014-04-03 17:16:25 -07:00
7664a42a38
Merge pull request #5004 from shykes/api-unit-tests
...
Replace integration tests with unit tests for the remote API
Upstream-commit: dbd1e304f57c40d0cac925727832d588d453c414
Component: engine
2014-04-03 17:06:05 -07:00
8e7c545689
api/server: convert TestGetInfo from an integration test to a unit test.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 2cb560988b111ee736c4ab22588d2091cb04075e
Component: engine
2014-04-04 00:02:44 +00:00
2948228586
api/server: replace an integration test with a unit test using engine mocking.
...
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: c8f437aee0d90d4955a6aaa35f8e0b74e7ac99a3
Component: engine
2014-04-03 23:53:39 +00:00
96808698c3
Deprecate 'docker insert'
...
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.
This removes the command from usage and documentation, and prints a
warning when it is called.
The command still works but it will be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 615ac8feb27b2b3db0c06b37ecd87b710eabffef
Component: engine
2014-04-03 23:52:09 +00:00
14694d6df5
Deprecate 'docker images --tree' and 'docker images --viz'
...
* The commands are no longer listed or documented.
* The commands still work but print a deprecation warning.
* The commands should be removed in a future version.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
Upstream-commit: 7c3b955b907c33238c1c155ae8860b2cec929c8b
Component: engine
2014-04-03 22:03:23 +00:00
228e989bbd
Merge pull request #4961 from creack/update_version_pkg
...
Update Version to not use string anymore
Upstream-commit: 93bb20816418f68d8a47f8252e664856f7b554b1
Component: engine
2014-04-01 18:37:25 -07:00
0423604572
Add API version to docker version
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: b246fc33ae4f05b5084fed8fc9f1034e36d87d78
Component: engine
2014-04-01 17:30:19 -07:00
d9e5457b6e
Update Version to not use string anymore
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 3ee37f547f4685ab88bfc39517cc18c1911451e5
Component: engine
2014-04-01 15:46:52 -07:00
91f0b97e4d
Merge pull request #4948 from creack/push_single_tag
...
Allow push of a single tag
Upstream-commit: e175a55eb9f0fe78d42559a716c7f69c707d7f87
Component: engine
2014-04-01 12:54:15 -07:00
9f401b129b
Minor cleanup
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: cff5f0357ea35245ac906a0326863ac1f8c47c61
Component: engine
2014-04-01 10:27:05 -07:00
9ef93e6d75
Allow push of a single tag
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: e648a186d68dcb3ee0d6123b041c5aa66438cc89
Component: engine
2014-03-31 18:50:10 -07:00
3205f2e595
Make sure to set error reguardless of attach or stdin
...
Fixes #3364
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 51d9a04f17d1c8c6c1a069227c1417b20283dda2
Component: engine
2014-03-31 18:33:14 +00:00
e50dea8a4b
apply Reduce error level form harmless errors
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 7697aad7b0537dade1d598cca5b7b1b420fa47c9
Component: engine
2014-03-31 18:11:53 +00:00
9772d36088
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 185b040e49aa9ab74f8d9254c7ff86b2891e3708
Component: engine
2014-03-31 18:11:53 +00:00
3772f57532
split client in 2 files
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: ae9ed84fdab4db5cec663bbd2d4ba8bcad897dcc
Component: engine
2014-03-31 18:11:53 +00:00
