Commit Graph

154 Commits

Author SHA1 Message Date
90c80009e3 Add Sockets (-H) list to docker -D info.
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: f54823bf05af1d549aee4f0d1f56f9a8995eb268
Component: engine
2014-06-24 12:25:17 +10:00
929a82a086 Merge pull request #6571 from vbatts/vbatts-raw_json
raw json for `docker save`
Upstream-commit: a5f5d5e8d7e3e70c681059f399714f0e7610dff6
Component: engine
2014-06-20 23:55:10 +03:00
c6816e3f6c Merge pull request #6503 from LK4D4/verbose_parallel_error_pull_#6484
More verbose error for parallel pull
Upstream-commit: 189967a12ae6a7be994238054086b23115d25548
Component: engine
2014-06-20 13:29:51 -07:00
8e5f8dab9b server: buildfile: ensure that ONBUILD triggers aren't committed
This patch fixes the bug where ONBUILD triggers are committed each build
step created during the ONBUILD trigger execution, since the triggers are
only wiped *after* all ONBUILD trigger steps have been committed. This was
fixed by simply copying the ONBUILD triggers and wiping the config
*before* committing anything.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 7303467c771cc98f0efcdf8cbb2e0538ad496b72
Component: engine
2014-06-19 20:33:17 +10:00
b42966840e cleanup all mentions of insert
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 3e2a9f667fbfd2b526b5bab4f8983f8c44685e87
Component: engine
2014-06-18 23:13:54 +00:00
e2604caa0f Merge pull request #5559 from bmurphy1976/bmurphy1976-history-bug
Test and fix history command ordering
Upstream-commit: d803523cdca38f4de61add3bd114373fe4ac0dc7
Component: engine
2014-06-18 14:34:00 -07:00
cae061b3cb More verbose error for parallel pull
Partially fixes #6484
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 3303789b4f8dd2a38a908f654f557f4906c2d141
Component: engine
2014-06-18 23:30:52 +04:00
5ad6516933 Refactor events publishing
Events subscription (/events API endpoint) attributes pseudo-unique identifiers to incoming subscribers: originally its host, then its subscription time. This is unecessary and leads to code complexity.

Introduce a JSONMessagePublisher to provide simple pub/sub mechanism for JSONMessage, and rely on this new type to publish events to all subscribed listeners. The original logic is kept for the 'since' and 'until' parameters, and for client disconnection handling.

Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com> (github: icecrime)
Upstream-commit: d0c4e448632f49b73bf63862a4b20b142ff7f2c9
Component: engine
2014-06-17 21:56:22 +02:00
7d55b5369e do not alter json in docker save
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 3e4e8636c1b05626cae720b47ef99109077e1d3a
Component: engine
2014-06-17 00:06:21 +00:00
f9497861c8 Fix race in LogEvent
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: a1b7a35c90f05b113b7c3aa474b74d1d2afbf7b6
Component: engine
2014-06-11 15:23:33 +04:00
ba21a2d751 Add integration test for history command and fix bug where history
would occasionally be returned in the incorrect order if sequential
layers had the same created time.

Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com> (github: bmurphy1976)
Upstream-commit: e827c8ff61a0e71b77bfb7a73c2e45703c1f470a
Component: engine
2014-06-09 10:45:54 -05:00
c2d0bb307f Disable timeout for push
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 8baafacf404265c95753e63d2b7510731359c4b4
Component: engine
2014-06-07 23:48:25 +00:00
e29c2c6bde Totally remove insert feature
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7a145b022a3b50b0d04cb0471d517f7c6c5efc67
Component: engine
2014-06-04 17:35:15 -07:00
165554f7ab Merge pull request #6178 from calfonso/freezer-pr-integration
Freezer integration to support container pause/unpause
Upstream-commit: 048833c246e793f8ce5256cc9db17aad758432e3
Component: engine
2014-06-05 01:29:47 +03:00
0fc07e0aef Integrating systemd freeze functionality.
This pulls together #6061 and #6125

Docker-DCO-1.1-Signed-off-by: Chris Alfonso <calfonso@redhat.com> (github: calfonso)
Upstream-commit: 26246ebd5379a83b2ed656668bd985c652e98167
Component: engine
2014-06-04 13:33:44 -06:00
77114664a4 Add ability to pause/unpause containers via cgroups freeze
This patch adds pause/unpause to the command line, api, and drivers
for use on containers.  This is implemented using the cgroups/freeze
utility in libcontainer and lxc freeze/unfreeze.

Co-Authored-By: Eric Windisch <ewindisch@docker.com>
Co-Authored-By: Chris Alfonso <calfonso@redhat.com>
Docker-DCO-1.1-Signed-off-by: Ian Main <imain@redhat.com> (github: imain)
Upstream-commit: b054569cde788b2111ddbc4080b215dcda89f06e
Component: engine
2014-06-04 13:33:44 -06:00
a0957a5314 pass address of metaHeaders to GetenvJson in ImagePush and ImagePull
Docker-DCO-1.1-Signed-off-by: kies <lleelm@gmail.com> (github: kieslee)
Upstream-commit: eb3e2f4f4736eaaab260804ff8543fb77243a254
Component: engine
2014-06-04 17:54:06 +08:00
7d08ad30f3 Merge pull request #4430 from vbatts/vbatts-images_orphan
Adding -f untagged=true flag to `docker images`
Upstream-commit: 5aeb77296a974e512a533f9014376ce837f05b50
Component: engine
2014-06-03 20:33:56 +03:00
0c475a0cf3 filters: don't encode empty set. API docs
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 02255ddaa4948fd94450fd5d9d2ee9b147e88352
Component: engine
2014-06-03 12:19:26 -04:00
72a70c7e5f Merge pull request #5848 from unclejack/resumable_pulls
resume pulling the layer on disconnect
Upstream-commit: b292928cd5414e3fc3452d409e490460adbd5e51
Component: engine
2014-06-02 14:07:01 -07:00
9b403bb6e9 switch skipping from error to debug
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: af6ab357e8db8888429a28014f629af19a2250b8
Component: engine
2014-06-02 20:47:07 +00:00
e355fe478a filters: change untagged to dangling
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 3ecfaa8f2da60bb4e6ce6c9ae0428bc7b647e34b
Component: engine
2014-06-02 16:33:52 -04:00
c3f842bed4 server: very debug.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: f322168563dee9d0361524d15c6a5069772b44f8
Component: engine
2014-06-02 16:33:52 -04:00
2dd212e295 filter flag: split out for separate --filter flags
adding tests and allowing for easy passing of filters.Args from client
to server.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: f1cc7ce5d728d6bdb1b3ab668e36fb1fc66515ff
Component: engine
2014-06-02 16:33:51 -04:00
9a7aaea6bb images filter: remove the redundant inverted filter
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: cb7857de5d2595632b76e4e17acede85a519001a
Component: engine
2014-06-02 16:33:51 -04:00
f90ca07ea9 filters, for images: start with untagged/tagged boolean
This is a new feature and flag. (replaces the suggestion of a flag for
--untagged images).
The concept is to have a syntax to filter. This begins with this
filtering for the 'images' subcommand, and at that only filtering for
whether images are untagged.
  example like: docker rmi $(docker images -q --filter 'untagged=true')

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 5f3812ec97f9a951bceb482fdcd355b6cbc1b113
Component: engine
2014-06-02 16:33:50 -04:00
29a9622323 resume pulling the layer on disconnect
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 2a1b7f222a5eff596cabb5ebd88a481a83b24402
Component: engine
2014-06-02 21:41:22 +03:00
b92a4a943f Merge pull request #6089 from unclejack/docker_build_copy
add support for COPY to docker build
Upstream-commit: 2024a0e517d9b5e009bd8935de60c4782cc1d17a
Component: engine
2014-06-01 01:26:31 +03:00
39456c1da3 Fix race on shutting down
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: ce9e9ff4a101eec5632704003fae772e8762eb15
Component: engine
2014-05-30 14:15:46 +04:00
82589e5ffd Fix races on TagStore accessing
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c4990ab999d49e261c5079925f0b13ef735a729f
Component: engine
2014-05-30 13:36:14 +04:00
e498aa81c8 add support for COPY to docker build
This adds a COPY command to docker build which works like ADD, but is
only for local files and it doesn't extract files.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 180c2a678510a93a442f1bcdb6a47287ec88ccd6
Component: engine
2014-05-29 00:07:52 +03:00
b049a6c181 Use Timeout Conn wrapper to set read deadline for downloading layer
Docker-DCO-1.1-Signed-off-by: Derek <crq@kernel.org> (github: crquan)
Upstream-commit: 02f4ae6c56474b1f4e747916812b38134d503349
Component: engine
2014-05-27 22:50:04 -07:00
373cdb1136 Merge pull request #5993 from LK4D4/fix_race_on_stop_#5154
Add synchronization between jobs and server closing
Upstream-commit: 494cbbec4456ec5b6ef7c9a787bbca7efd411639
Component: engine
2014-05-23 11:31:10 -07:00
0b384856c1 Fix add hang when dest is .
Fixes #3960
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c8ada301baf66360af6a3445b7c2abd629da3fd1
Component: engine
2014-05-23 00:26:38 +00:00
022fe9a0d3 Add synchronization between jobs and server closing
Fixes #5154
Daemon waiting 15 seconds for finishing server jobs before shutdown. In
this time it doesn't accept new jobs. After this time, it shutdown
despite running jobs.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: f92d68a6cedd069c138ac83961ad54ceb937ebd0
Component: engine
2014-05-22 22:54:49 +04:00
456a42e6c9 Merge pull request #5839 from unclejack/improve_build_rm
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
2014-05-22 10:54:05 -07:00
1e7aa2e3c4 remove chmod 755: fixes #5941
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 56a53c72d285b3f9fa6b34dcb81c9720a1974bde
Component: engine
2014-05-21 11:35:08 -07:00
b9dbdb7d9e Merge pull request #5755 from vieux/move_inspect_daemon
move inspect from server to daemon
Upstream-commit: 83e9dc720039cfa8685b8dc59f76ca2f1e9489d2
Component: engine
2014-05-20 15:50:38 -07:00
45b3b14782 Merge pull request #5951 from vieux/pr5919
Fix remote add cache
Upstream-commit: 240fad497415d798fcaef6dcd8d1231f93a4887c
Component: engine
2014-05-20 14:33:05 -07:00
9c8b2dfbeb Remove the mtime for temp file. Prevent false negative cache
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: bcfe2ceffb1c4c7006570d4ba21ed2068bb448a1
Component: engine
2014-05-20 21:31:28 +00:00
76507afd3a force the read of the tarSum so that sums actually get computed
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv> (github: bjaglin)
Upstream-commit: 9810da853bd890b6c963017555c3555ef9e0d842
Component: engine
2014-05-20 21:31:28 +00:00
74d86a8d61 move inspect from server to daemon
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 603e00a3a7644caf118d3efd0932500b4dfc4de3
Component: engine
2014-05-20 19:36:15 +00:00
09f949815a Move init volumes code to func
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e454be7567e144dc836ff283d4f4e059db307a91
Component: engine
2014-05-19 22:04:51 +00:00
978fda27ac bump remote api to 1.12 & add --force-rm to build
This adds a `--force-rm` flag to docker build which makes the Docker
daemon clean up all containers, even when the build has failed.

This new flag requires that we bump the remote API, so we also bump the
remote API version.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 667e2bd4ea5fbc8698c34565f955cb92cff92890
Component: engine
2014-05-19 23:10:49 +03:00
20387c224e Make chmod on ADDed files
Fixes #3979
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 620c8c72535670e8358cebc65a2fb424be58a93c
Component: engine
2014-05-20 00:09:39 +04:00
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
0eaa2babd7 Merge pull request #5436 from hobofan/master
reapply Cmd value even if CmdAdd returns early
Upstream-commit: 4b587ac118284fbbc9b10c20319b2dd8c20d4b4f
Component: engine
2014-05-16 12:45:23 -07:00
c6f81b2d5f server/buildfile: correct daemon.Create comments
s/and start it//

Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 8b31824ad6118ed505b43443816c1492e3d81c8c
Component: engine
2014-05-16 10:50:02 -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
785f4eb416 Check channel closed state in /events loop
When listener channel is closed, it becomes always available for
reading: select becomes an active loop which writes default-constructed
events (i.e: empty strings).

Fixes #5766.

Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <arnaud.porterie@gmail.com> (github: icecrime)
Upstream-commit: 8699f53e6a033a7b5b55a2b6356da7c6e220d01f
Component: engine
2014-05-14 22:35:04 +02:00