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
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
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
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
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
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
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
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
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
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
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
14450304fa
split API into 2 go packages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a7365a6237c45ed05d96ab11f36fde35d675b462
Component: engine
2014-03-31 18:10:02 +00:00