Commit Graph

34 Commits

Author SHA1 Message Date
b3b1e4936b Remove Job from PS API
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 1bfa80bdd9ac05b01867492d2e6dda668aa7715c
Component: engine
2015-04-08 10:30:17 -07:00
ef8d6cbdf1 Last step in removing engine.Tabel from api/client/*
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 065648a8324a0df5d5d05b3df223e6b058260425
Component: engine
2015-04-06 10:55:53 -07:00
cd5f423b1f Bump API version and docs to v1.19
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 81f9b72c648142745c63ab0ba2b495646dccd88d
Component: engine
2015-04-01 13:40:56 -07:00
e5b36a723c Replace aliased imports of logrus, fixes #11762
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 6f4d847046cb4e072de61d042c0266190d73a8c9
Component: engine
2015-03-26 23:22:04 +01:00
d3b04844fa Add comments to api/common constants, closes #11583
Signed-off-by: Avi Das <andas222@gmail.com>
Upstream-commit: c136591f40c34de51bbb0691ae69f393ff8b2f0e
Component: engine
2015-03-23 22:35:41 -05:00
c29e43cc4b Format error by value
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 210ab030bc3dab7bcf8f7252f2f9facb5a26cb6b
Component: engine
2015-03-16 12:05:53 +01:00
a1047d5010 fix naming, add a test for port range on docker ps
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ba99a73c2fc3050475bd6c066c32dcb557cf6f25
Component: engine
2015-02-16 11:08:32 -08:00
0e5cf57545 Group published and exposed ports by contiguous ranges
Signed-off-by: Colm Hally <colmhally@gmail.com>
Upstream-commit: 5dfef4fe08b890022f600fe742e5a4372b023767
Component: engine
2015-02-16 10:52:23 -08:00
5c56835bc1 Bump api version to 1.18
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d92b4232f7c7cb64efd8e56c33238b4426fe22af
Component: engine
2015-02-10 10:48:54 -08:00
b2ffb55f86 Merge pull request #10360 from dmcgowan/keyfile-error-message
Add file path to errors loading the key file
Upstream-commit: e15300b251e813cd8b262832fccc8af475979f1c
Component: engine
2015-01-26 14:44:07 -08:00
ff273f30e2 Add file path to errors loading the key file
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a90e91b500bb1a39a7726025973b5748148768c1
Component: engine
2015-01-26 12:58:45 -08:00
3acf78c713 Use filepath instead of path
Currently loading the trust key uses path instead of filepath. This creates problems on some operating systems such as Windows.

Fixes #10319

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 2cd5b7dae80c5451b729a0be2ade03cbdf2c5c26
Component: engine
2015-01-23 14:44:30 -08:00
fd76e3bccd bump API version
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 9c7689a10e60cd921e1521c729c07184b7c1076c
Component: engine
2015-01-22 01:15:34 +00:00
269ee3bcdf Allow for Dockerfile to be named something else.
Add a check to make sure Dockerfile is in the build context
Add docs and a testcase
Make -f relative to current dir, not build context

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: eb3ea3b43c716ad727521a7d0bc20d7321bb0867
Component: engine
2015-01-06 16:33:26 -08:00
482d9b0df3 Be consistent about libtrust import path.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7c7026bd2255cef47cbb026afe0b984d4c9a9130
Component: engine
2014-12-03 17:36:14 -08:00
4b4f9725e6 Update libtrust version
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6e92dfdfd843aec909572a405337efb25beb6f58
Component: engine
2014-11-20 17:39:54 +00:00
f066184384 add ID and Hostname in docker info
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 9a85f60c75f2017b14ed5e7f2bae5dc4961cb74c
Component: engine
2014-11-17 19:23:41 +00:00
2d56e3cbc6 Use logrus everywhere for logging
Fixed #8761

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 7c62cee51edc91634046b4faa6c6f1841cd53ec1
Component: engine
2014-10-24 15:03:06 -07:00
82b5bee9bb Bump API to v1.16.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: ca6cc6560987a87b8f3b4fe4c3c227d692c49117
Component: engine
2014-10-24 11:25:44 -07:00
b22bbbc6cc Bump docs and api to 1.15
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: e261618b24b6837c820dccd8fa734eafc8b7f399
Component: engine
2014-08-26 13:08:50 +04:00
4737f7cea5 Extract log utils into pkg/log
Docker-DCO-1.1-Signed-off-by: Josiah Kiehl <josiah@capoferro.net> (github: capoferro)
Upstream-commit: a02f67be5b17da63d475e6f35956c1e72c3b2e7b
Component: engine
2014-08-13 15:18:15 -07:00
e25f77248d Move parsing functions to pkg/parsers and the specific kernel handling
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 4398108433121ce2ac9942e607da20fa1680871a
Component: engine
2014-07-29 13:09:10 -07:00
6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
952492cc20 bump api to 1.14 & update docs
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 680e27d6ec7662462594fd5264a00c09bcb14da4
Component: engine
2014-07-10 03:24:01 +02: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
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
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
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
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
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
a638dc66f8 In docker ps, sort by port instead of unsorted.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org> (github: erikh)
Upstream-commit: e32965dbb13973f61ba1c0496c8136cc8c9273a2
Component: engine
2014-03-16 16:28:44 +00:00
0820020142 bump API version
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e7cc88c39f302c020f70a00bca54bddeecb608a4
Component: engine
2014-02-25 21:08:07 +00:00
1ab53bd0df fix gofmt
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 4434b63ff44c6994366afebeceb9b570bb9ee26c
Component: engine
2014-02-24 23:10:45 +00:00
fbf1d0f723 api/common.go: code shared by the server and client implementation of the Docker remote api.
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 551355c9adac6a8b36244e1962e7a104611ae4af
Component: engine
2014-02-24 11:54:50 -08:00