adef76604d
Merge component 'cli' from git@github.com:docker/cli master
2017-09-01 16:25:12 -07:00
5a2228df09
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-09-01 16:10:15 -07:00
cc688b2215
Remove RPM changelog
...
We haven't been updating it, seems like a waste to just track releases
through it.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 895abef8259363895fda4587f5a157f588608234
Component: packaging
2017-09-01 15:25:26 -07:00
f119dacce1
Merge pull request #485 from seemethere/re_add_test_target
...
Re-adds test target to the Makefile
Upstream-commit: d861a1c3dd
2017-08-31 17:50:14 -07:00
dfa6a23587
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-08-31 17:11:47 -07:00
b508d80e8c
Merge pull request #47 from andrewhsu/libudev-dev
...
added libudev-dev pkg as build requirement
Upstream-commit: 88b7df7cde5e989d9622d009f4e7373ccbcfe828
Component: packaging
2017-08-31 17:10:18 -07:00
c57dae8fc6
remove debian-wheezy armv7l dockerfile build env
...
Because we don't ship it.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: cbcf1f67165278fc789d3c68b2965a05dbf823c9
Component: packaging
2017-08-31 16:26:00 -07:00
827348367b
added libudev-dev pkg as build requirement
...
For jessie and wheezy flavors of distros. Some dep seems to have changed
from before.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: be93a43e60b60befd6d6688e0cb8e23bc27c0724
Component: packaging
2017-08-31 16:24:25 -07:00
d48b9a840a
Merge pull request #489 from dnephin/fix-container-run
...
Fix crash in container run after pulling an image
Upstream-commit: d817967647
2017-08-31 18:11:26 -04:00
5ed8076112
Merge pull request #484 from ripcurld0/ps_exit_1
...
When nothing found in stack exit with exit code 1
Upstream-commit: 5a9bf7f359
2017-08-31 17:13:00 -04:00
264557313d
Fix crash in containe run after pulling an image.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a0d8d80250
2017-08-31 17:08:02 -04:00
fdee4e99e9
Re-adds test target to the Makefile
...
The test target existed before, this is to provide a legacy interface to
allow easy testing for downstream Docker CE.
Without this we would need separate Makefiles/Jenkinsfiles for releases
past 17.07. Later on this target could also be used to test both unit
tests and integration tests at the same time.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: d53c8de06b
2017-08-31 10:32:00 -07:00
84f9eef358
remove fedora-24 build scripts because it is EOL
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: a84d468adb9c44c12c90e9358b54a5f089ee302f
Component: packaging
2017-08-30 20:07:33 -07:00
08880363bd
Merge pull request #29 from thaJeztah/remove-redundant-contrib
...
remove desktop-integration contrib from .deb
Upstream-commit: 50c7ac954e520fc9270cc765d3c11afb5b261154
Component: packaging
2017-08-30 19:47:50 -07:00
8c93ab2869
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-08-30 19:20:19 -07:00
9dabee631f
Merge component 'engine' from git@github.com:moby/moby master
2017-08-30 16:44:42 -07:00
5a06fdc713
Merge component 'cli' from git@github.com:docker/cli master
2017-08-30 15:35:48 -07:00
ac255fc662
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-08-30 15:29:29 -07:00
384ceb07e9
When nothing found in stack exit with exit code 1
...
To keep on a consistent behaviour such as in docker-service-ps
if docker-stack-ps didn't find a given stack, the command line
should exit with exit code 1.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 79f9af2475
2017-08-30 23:25:36 +03:00
117658f23d
Adds ppc64le builds for ubuntu zesty
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 2eeeff85dcef8bd684425a56dda5ae83b3f5fc58
Component: packaging
2017-08-30 13:07:10 -07:00
8bf4dec055
Merge pull request #475 from AliyunContainerService/start_period
...
Support start_period for healthcheck in Docker Compose
Upstream-commit: e636a5388c
2017-08-30 14:11:43 -04:00
98aa729835
Merge pull request #34554 from dnephin/use-release-version-of-docker-cli
...
Pin docker-cli version to the 17.06-ce release version
Upstream-commit: e23965d620e1655f44d47edd8b5e08c2c384fd03
Component: engine
2017-08-30 13:43:39 -04:00
8be8bd8ae1
Merge pull request #477 from dnephin/some-tests-for-container-command
...
A few tests for container command
Upstream-commit: 8ea02f6f08
2017-08-30 09:38:38 -07:00
73cf62aaae
Change the type of interval, timeout and start_period of healthcheck from string to * time.Duration
...
Signed-off-by: Li Yi <denverdino@gmail.com >
Upstream-commit: e02fcfd34e
2017-08-30 23:39:12 +08:00
17038054a4
Merge pull request #34667 from dnephin/add-container-config-decode-tests
...
Add container config decode tests
Upstream-commit: e95585f7b0c1ad93dee0fb5cbd8a5c387053f140
Component: engine
2017-08-30 07:25:27 -07:00
de66c38335
Merge pull request #34668 from dnephin/fix-registry-dependencies
...
Fix bad import graph from opts/opts.go
Upstream-commit: d85e83960b4aa77e8cf59dd1eabac1884359575f
Component: engine
2017-08-29 19:55:23 -04:00
811eac4392
Reduce complexity in cli/command/container
...
Add tests for exec and cleanup existing tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e7f90b6b38
2017-08-29 19:25:50 -04:00
853b31143d
Add ulimits to unsupported compose fields.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bdc8cf364e
2017-08-29 17:05:16 -04:00
f77a5de38d
Remove command line flag install from registry package.
...
Settings flags is the responsibility of the application (cmd/) not a library
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 73ec0ff86b06925e63016c0948be3a49cf8915b4
Component: engine
2017-08-29 15:55:09 -04:00
931cac7408
Fix bad import graph from opts/opts.go
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b68221c37ee597950364788204546f9c9d0e46a1
Component: engine
2017-08-29 15:32:43 -04:00
897f142771
Add decodeContainerConfig test removed from docker/cli
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 06ecc04167622077bf96ab8f8a14fe93a90179a7
Component: engine
2017-08-29 15:14:50 -04:00
79507cd3e5
Add gotestyourself/skip
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 385727588ed68dafb7d18906d7b15260b52778e8
Component: engine
2017-08-29 14:35:12 -04:00
4ac950c1d0
Remove unused vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 8edd2dd3df
2017-08-29 13:22:17 -04:00
ee93512169
Remove test for code not in this repo.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: dae1b7112c
2017-08-29 13:19:28 -04:00
55ca4eff51
Merge pull request #33684 from dnephin/update-service-ps-tests
...
Update service ps to be an API test
Upstream-commit: 15b8d0420b57776028875dbf89fc6d9dbb0666e2
Component: engine
2017-08-29 09:44:20 +02:00
a4cd4da158
Support start_period for healthcheck in Docker Compose
...
Signed-off-by: Li Yi <denverdino@gmail.com >
Upstream-commit: 0abdad615f
2017-08-29 11:19:29 +08:00
f0c0f969b6
integration-cli: fix testutil refactor merge conflict
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ba6f9e4cc9687dd1ccd1ab304b363ed578c6d908
Component: engine
2017-08-28 10:19:54 -07:00
ef16add9bb
Merge pull request #34263 from estesp/chown-flag-add-copy
...
Add --chown flag to ADD/COPY commands
Upstream-commit: a1183dda578f531ef65766611f9e16a0636e3a17
Component: engine
2017-08-28 09:50:44 -07:00
83dbde2057
Reduce complexity of two formatters
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d318c4112b
2017-08-28 12:49:07 -04:00
7ae4b76cda
Merge pull request #471 from cyli/surface-autolock
...
Include whether the managers in the swarm are autolocked as part of `docker info`
Upstream-commit: 7e52344cd2
2017-08-28 17:46:09 +02:00
ae8028a8f8
Merge pull request #34331 from twistlock/plugable_secrets_backend
...
[WIP] update swarmkit dependecies to support plugable secrets
Upstream-commit: 964ba0eaa83ac44e614c7ca68fbe2d92c5435a8c
Component: engine
2017-08-28 10:31:27 -04:00
36da978ca7
Merge pull request #34468 from Microsoft/jjh/lcowisolation
...
LCOW: Force Hyper-V Isolation
Upstream-commit: a63a2e84d8613cd6a666cafcd3d521fc0df46706
Component: engine
2017-08-27 13:35:55 -07:00
4a60bb27ab
Merge pull request #34615 from dnephin/remove-pkg-testutil-assert
...
Move ErrorContains to an internal package
Upstream-commit: 6ed5db6243243c8b7ee3ff165f21bda4465124e5
Component: engine
2017-08-26 19:09:27 -07:00
6143a4613a
Include whether the managers in the swarm are autolocked as part of docker info.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 3428b78e96
2017-08-25 16:33:46 -07:00
1057cf80e4
Replace service ps cli tests with service inspect API test.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6cd6d8646a90fa2013416bc8f11bd78d72c4180d
Component: engine
2017-08-25 17:27:41 -04:00
402a69d8fb
Cleanup daemon.LoadBusybox() to use the API instead of client
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 98a4613017df2b7de045d93e25a376fd00baeb0c
Component: engine
2017-08-25 17:24:25 -04:00
29f6815811
Add gotestyourself to vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 381a1c0a5ac99b6d7ab33a29150878b9a8008e95
Component: engine
2017-08-25 17:24:25 -04:00
67a4f5a5d6
Merge pull request #34613 from dnephin/remove-pkg-testutil-cmd
...
Remove pkg testutil cmd
Upstream-commit: a5631c75e1349f6d71c53dbabee7f166f770d2b2
Component: engine
2017-08-25 15:09:52 -04:00
de5380dba8
Merge pull request #454 from mstanleyjones/resource-updating-windows
...
docker update does not work on Windows containers
Upstream-commit: 21b5bbe411
2017-08-25 19:57:12 +02:00
2d72ab2282
docker update does not work on Windows containers
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 047d3c23a7
2017-08-25 10:35:28 -07:00
