5f26edda74
Merge component 'cli' from git@github.com:docker/cli master
2017-12-01 03:52:40 +00:00
4a8c6447a6
Merge pull request #719 from vdemeester/test-secret-config-indempotence
...
Add unit tests on config/secret indempotence in stack deploy
Upstream-commit: 6b63d7b96a
2017-11-30 08:39:56 -08:00
9818aadf77
Add unit tests on config/secret indempotence in stack deploy
...
Related PR : https://github.com/docker/cli/pull/509
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5ed399e588
2017-11-30 09:45:32 +01:00
617fb8ceb7
Merge pull request #702 from albers/completion-log--until
...
Add bash completion for `logs --until`
Upstream-commit: b45a49c83f
2017-11-30 09:40:08 +01:00
02055337d8
Merge pull request #694 from riyazdf/trust-inspect
...
docker trust inspect
Upstream-commit: d921d5cc39
2017-11-29 11:33:53 -08:00
f8c7f6621d
Use default inspect formatting, remove omitempty, update docs
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: a9428285f0
2017-11-29 10:52:35 -08:00
b1e7ee7a82
support multiple arguments to trust inspect
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 1eb87cc096
2017-11-29 10:52:34 -08:00
7e9b53fd42
add docker trust inspect command for JSON viewing
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: cd38d39d0d
2017-11-29 10:52:34 -08:00
9b7953e812
Merge pull request #718 from dnephin/fix-e2e-docker-build
...
Fix e2e build test
Upstream-commit: 1b4f2d3b73
2017-11-29 10:30:31 -08:00
a79583a886
Merge pull request #677 from albers/completion-log-opts
...
Add new log driver options to bash completion
Upstream-commit: 4f009541cb
2017-11-29 10:01:19 -08:00
fe41a825e2
Merge pull request #678 from albers/completion-build--stream
...
Add bash completion for experimental `build --stream`
Upstream-commit: c428561b63
2017-11-29 10:00:23 -08:00
264f9d5a4f
Merge pull request #701 from albers/completion-trust-sign--local
...
Add bash completion for `trust sign --local`
Upstream-commit: e5d49c0199
2017-11-29 09:44:53 -08:00
40b8aa0152
Merge pull request #467 from estesp/chown-flag-docs
...
Add docs for Dockerfile ADD/COPY --chown flag
Upstream-commit: 12765c318f
2017-11-29 09:28:30 -08:00
29f2890225
Fix e2e build test
...
The build output changed in 17.11
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 16cd84024c
2017-11-29 11:02:40 -05:00
cbde088d23
Merge pull request #716 from vdemeester/bump-go
...
Bump Go to 1.9.2
Upstream-commit: 8abb266043
2017-11-29 09:42:58 -05:00
1433c3b1eb
Bump Go to 1.9.2
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6859a7387b
2017-11-29 09:16:03 +01:00
7f2221039e
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-11-28 18:03:52 -08:00
6be246bf8b
Merge component 'engine' from git@github.com:moby/moby master
2017-11-28 18:03:40 -08:00
67203bb69e
Merge pull request #429 from RenaudWasTaken/generic-resource
...
Integrated Generic resource in service create
Upstream-commit: 97b148b440
2017-11-28 18:01:42 -08:00
99c53b25ef
Merge component 'cli' from git@github.com:docker/cli master
2017-11-28 17:01:27 -08:00
6d8eeeb431
Merge pull request #35586 from ndeloof/patch-1
...
`memory` is an int64 (long)
Upstream-commit: 9243c28ba541281eaba43e51658f8dd032679ebc
Component: engine
2017-11-28 16:32:04 -08:00
0569c43fe3
Merge pull request #35632 from anusha-ragunathan/fix-panic
...
Fix potential panic during plugin set.
Upstream-commit: f943df7d4824424bd648d7a165e89be8a65a952e
Component: engine
2017-11-28 15:50:12 -08:00
b7dabb480c
Fix potential panic during plugin set.
...
Plugin config can have Mounts without a 'Source' field. In such cases,
performing a 'plugin set' on the mount source will panic the daemon. Its
the same case for device paths as well. This detects the case and
returns error.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 6572e27df7f3483cfed7a8294c1f6d9cf157809a
Component: engine
2017-11-28 13:06:24 -08:00
2598a6cd6a
Added support of Generic resources in compose file
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 1ff73f867d
2017-11-28 21:52:09 +01:00
405736f2fc
Merge pull request #714 from doncicuto/patch-1
...
Update Flocker plugin link
Upstream-commit: e004dc01d4
2017-11-28 10:20:10 -08:00
77a39cce80
Added support for generic resource update
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 20a6ff32ee
2017-11-28 18:03:10 +01:00
025793bb76
Added docs for service create
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 4a6da88f7a
2017-11-28 18:03:10 +01:00
4ba8859964
Added docs for dockerd
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: fe07ca70d6
2017-11-28 18:03:10 +01:00
2eb0bb6fa6
Added Generic Resource tests
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 51c7cd91cf
2017-11-28 18:03:10 +01:00
6c65651aa2
Updated GenericResource CLI
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 7ddd5f3434
2017-11-28 18:03:10 +01:00
f62d716bb0
Revendored swarmkit
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com >
Upstream-commit: 7843aec98c
2017-11-28 18:03:10 +01:00
a94e4ed04a
Merge pull request #35572 from arm64b/big-image-imp-test-aarch64
...
image: skip the import test on AArch64
Upstream-commit: c307e0ce49d63d1b1f479560955dca3956f005ec
Component: engine
2017-11-28 13:51:15 +01:00
0637acf0b1
Update Flocker plugin link
...
ClusterHQ shutted down at the end of 2016. It seems that ScatterHQ is a group of ClusterHQ former employees that have forked Flocker. It seems that no code has been commited in the last months but if somebody comes to this Docker page it should be referenced to ScatterHQ.
Signed-off-by: Miguel Angel Alvarez Cabrerizo <doncicuto@gmail.com >
Upstream-commit: 3e6e54a90f
2017-11-28 13:51:08 +01:00
016b82fbf3
image: skip the import test on AArch64
...
The commit '0a13f827a10d3bf61744d9b3f7165c5885a39c5d' introduces an
import test for CVE-2017-14992, it uses a 8GB image to make sure we
don't revert CVE-2017-14992, but unfortunately this test can't finish
in 5-min on AArch64, as a fact, in most cases we have to crate a very
big image to make the test effective on AArch64, but this will result
in a test panic, so now we skip it order to avoid termination of others
tests followed.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 6395b8b3dcc43be6750e0d90d9bab0a83e4eb20b
Component: engine
2017-11-28 01:48:49 +00:00
2ddb9ceeba
Merge pull request #35528 from thaJeztah/ignore-empty-graphdirs
...
Skip empty directories on prior graphdriver detection
Upstream-commit: 9ae697167c8b90b40d5248e99a8f0a0fc304637e
Component: engine
2017-11-27 17:37:39 -08:00
dcbc5aef35
Merge pull request #35612 from ikarpovich/35610-le-line-only
...
Logentries driver line-only=true []byte output fix
Upstream-commit: c75c45b18858cf34669b43e8cec25f70bd5803ea
Component: engine
2017-11-27 14:33:02 -08:00
5c33ebfbc1
Merge pull request #33892 from thaJeztah/bump-golang-19
...
Bump Go to 1.9.2
Upstream-commit: c672fbd69cb2b375011867860b3f46220655d3fe
Component: engine
2017-11-27 11:44:06 -08:00
9a7fb33c58
Merge pull request #35579 from dnephin/fix-layer-dne
...
Fix layer DNE with duplicate layers
Upstream-commit: 9fe48f081dafbff467643ce1119c7963f57d9ee8
Component: engine
2017-11-27 09:40:54 -08:00
c3f989d26b
This fixes casting of log message []byte into string with --log-opt line-only=true
...
Signed-off-by: Igor Karpovich <igor@karpovich.me >
Upstream-commit: 440e50b6c702b5e13fff9424ef656b6bb6a259f0
Component: engine
2017-11-27 14:26:53 +00:00
c7f0d04c5e
Merge pull request #33731 from runcom/rt-fix-update
...
container: update real-time resources
Upstream-commit: dfe2c023a34de3e1731e789f4344ef4d85070bc6
Component: engine
2017-11-23 18:30:22 -08:00
b02966efb1
Merge pull request #35563 from soccerGB/driveroptionpersist
...
Added support for persisting Windows network driver specific options …
Upstream-commit: 1f3f111b4577b29613b0ffef8f001679c2a62d6f
Component: engine
2017-11-23 16:31:46 -08:00
a737bf6704
Fix layer DNE with duplicate layers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 936ef0c4c97737066ae1e028f04b5188022a91b8
Component: engine
2017-11-23 15:41:59 -05:00
8a8ecdb59d
Merge pull request #709 from dnephin/e2e-docker-build
...
Add e2e test for docker build
Upstream-commit: 6476524c74
2017-11-23 13:54:41 -05:00
c34d673f0c
Merge pull request #689 from thaJeztah/remove-daemon-subcommand
...
Remove deprecated "daemon" subcommand
Upstream-commit: 227dfea9e1
2017-11-23 11:10:50 -05:00
12aa8ed3d8
memory is an int64 (long)
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 5ad85b1d4d69806754d1814f019b03b57e40d6da
Component: engine
2017-11-23 14:24:43 +01:00
dd75028635
Merge pull request #35576 from tophj-ibm/add-main-to-image-tests
...
[integration] add main_test for image test
Upstream-commit: fe8aac6f5ae413a967adb0adad0b54abdfb825c4
Component: engine
2017-11-22 14:42:56 -08:00
b88ff8a5c2
container: update real-time resources
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: dca82b9e5c53e96d1e34bec03e78e17feb8d6fdb
Component: engine
2017-11-22 22:21:40 +01:00
db4f5614fc
Merge pull request #668 from ilyasotkov/667-secret-config-names
...
Add "name" field to secrets and configs to allow interpolation in Compose files
Upstream-commit: 8d41ba082b
2017-11-22 13:33:59 -05:00
9f84ce63a5
[integration] add main_test for image test
...
Adds a main_test for the image integration test, so we can download
frozen images, and clean up after the image test is ran
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: be83f42612e3be42fcd60726d48d7346befc9449
Component: engine
2017-11-22 11:13:32 -05:00
34cc3d6434
Remove duplication for secrets / configs, combine 3.5 loader tests, remove extraneous error call, regenerate schema correctly
...
Signed-off-by: Ilya Sotkov <ilya@sotkov.com >
Upstream-commit: ec47003ecb
2017-11-22 13:41:16 +02:00
