Commit Graph

176 Commits

Author SHA1 Message Date
eb6f1ba58f Add Tibor Vass as maintainer
* hack/
* archive/
* integration/
* server/buildfile.go

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1a99f36580fc814778170ae68f5ea53694aa5c12
Component: engine
2014-07-11 12:28:11 +00:00
ceab494147 Stop/Kill options for containers removal
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 78100706303efdf9a3deee0239a7dbb3a93837ec
Component: engine
2014-07-11 23:26:08 +00:00
34b700c7bf Updated docker logs timestamp to RFC3339
Currently the docker logs timestamp flag generates log entries like:

    $ sudo docker logs -ft daemon_dave
    [May 10 13:06:17.934] hello world

It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].

This is non-standard operational timestamp and one that will require
custom parsing.

The new timestamp is RFC3999Nano and generates entries like:

    2014-05-10T17:42:14.999999999Z07:00 hello world

These are readily parsed by tools like ELK.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: aa0eca03e6662c5f6b4f0f47190a45f49b61e357
Component: engine
2014-07-09 11:59:06 -04:00
13e7613ad0 Fix server leaking events
Solves #6843.

Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
Upstream-commit: 5d4986c755526ad5d249ba96eb6213ce089a9c25
Component: engine
2014-07-09 00:08:36 +00:00
a8bb2012bc Merge pull request #6882 from cpuguy83/fix_gh#6856_add_pass_unpause_events
Add event logs for pause/unpause
Upstream-commit: f0aba1aad4d86c5f4989b40bd27be96d72eab6a2
Component: engine
2014-07-08 15:31:23 -07:00
34644f5fc5 Add event logs for pause/unpuase
Fixes #6856

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: e1ec91fc582f10d57025e39f0f7e7d6695f7454e
Component: engine
2014-07-08 15:27:44 -04:00
5a05ec9b94 Merge pull request #6857 from vbatts/vbatts-fix_save_repositories
docker save: fix the 'repositories' file
Upstream-commit: 52c58b9ea09655fdcd143f94d733a91229dd557c
Component: engine
2014-07-07 17:26:52 -04:00
df92ffe131 Merge pull request #6702 from mrunalp/dev/helper_fns
Move setting hostConfig and pulling images into helper functions.
Upstream-commit: 35b511b6d092c80b206c63df7bcbf372cf96bdf3
Component: engine
2014-07-07 11:39:27 -07:00
0fa89bda57 docker save: fix the 'repositories' file
For various use cases, the 'repositories' file does not match expected
behavior.

Like,

	docker save busybox:latest | tar t

Before:

	[...]
	busybox:latest/
	busybox:latest/VERSION
	busybox:latest/json
	busybox:latest/layer.tar
	# note, the layer name, and lack of 'repositories' file

Now:

	[...]
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/VERSION
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/json
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/layer.tar
	repositories
	# and the repositories file is correct for the single tagged
	# image.
	#> {"busybox":{"latest":"a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721"}}

and

	docker save a9eb17255234 | tar t

Before:
	[...]
	a9eb17255234/
	a9eb17255234/VERSION
	a9eb17255234/json
	a9eb17255234/layer.tar
	# Note the truncated layer name

Now:
	[...]
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/VERSION
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/json
	a9eb172552348a9a49180694790b33a1097f546456d041b6e82e4d7716ddb721/layer.tar
	# There is no 'repositories' file, because there is no named repo

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: ac392bc0d775455f71da3c71956f9f6ae7a87f6d
Component: engine
2014-07-05 16:52:23 -04:00
5488e10c5e Merge pull request #6771 from LK4D4/fix_containers_list_race
Add synchronization in server.Containers
Upstream-commit: 44d737707c513dd987933642680c36ef586b1b0e
Component: engine
2014-07-03 17:53:50 -07:00
18c97f39c3 server: Break out setHostConfig() from ContainerStart
This will be reused for ContainerCreate

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: a4a80b64a7f6366f7fb94cb8cca042a6324a0e99
Component: engine
2014-07-02 16:32:28 -04:00
c1f6739a06 Implement tail for docker logs
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1dc0caf9c0170ab8e7f5a2f77f2dbdacff322eff
Component: engine
2014-07-01 23:44:12 +04:00
ae1f05d70a Pause/freeze containers during commit
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.

Fixes bug: #6267
Fixes bug: #3675

Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com> (github: ewindisch)
Upstream-commit: 17d870bed5ef997c30da1e8b9843f4e84202f8d4
Component: engine
2014-07-01 00:30:21 +00:00
f17116cbd3 Add synchronization in server.Containers
This fixes races between ps and other operations
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: da853e98c94c9ce8001d3d1516ba0fd2614db3b0
Component: engine
2014-06-30 10:52:11 +04:00
52930d7389 Merge pull request #6232 from LK4D4/wait_functions_for_state
Wait functions for state
Upstream-commit: 680adb98e1fb4efc2116259887016e5d0fdd8c42
Component: engine
2014-06-27 13:33:13 -07:00
53991068e0 Use State waiting functions
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 57d86a5619adae5e08e0e28fba99f6a7c2f5ee54
Component: engine
2014-06-27 15:07:40 +04:00
cb56a2df49 Allow / as source of -v
We discussed this at the docker plumbers meetup and for tools and
working on the system for things like boot2docker and coreos this is
needed.  You can already bypass this check so we felt it is ok to start
allowing this feature.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: e39b8eade1f42503b6b7217e72eff4c8fdc13cb6
Component: engine
2014-06-26 10:50:18 -07:00
9a4ed6541e Merge pull request #6218 from vieux/update_maintainers
Upstream-commit: c9e647e42f3019b619b0ef47ff944831c226624c
Component: engine
2014-06-25 17:00:32 -07:00
f6a0457a3f Merge pull request #6649 from vieux/fix_api_return_codes_start_stop
return 304 is status isn't modified in start and stop
Upstream-commit: 5743151118d5b6965f573743ecaddf72792df034
Component: engine
2014-06-25 19:10:19 -04:00
4526ee08e7 fix whitespace that precedes the escape in a multiline string.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 03c5c1930d884f0052b4940643fa5b4fc57bdea7
Component: engine
2014-06-25 13:39:47 -07:00
986327e6e1 return 304 is status isn't modified in start and stop
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 53b036032d783c0a05362ef5722e2c55af503bb1
Component: engine
2014-06-24 18:31:56 +00:00
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
86a79a73e0 update MAINTAINERS files
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 06248d745a6a69b14595a699e0e5b3e883d8ea3a
Component: engine
2014-06-16 22:20:07 +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