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
0376ee94b9
Merge pull request #49 from seemethere/remove_rpm_changelog
...
Remove RPM changelog
Upstream-commit: cc3be7f52531077a29c2da0deef5f25a8631f3a1
Component: packaging
2017-09-01 16:03:38 -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
0c9cb73cd5
Merge pull request #46 from andrewhsu/rm-wheezy-arm
...
remove debian-wheezy armv7l dockerfile build env
Upstream-commit: fb9319c2ab914af7033486cb50926401cc97056c
Component: packaging
2017-08-31 16:32:43 -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
59d4d30f28
Merge pull request #45 from andrewhsu/rm-f24
...
remove fedora-24 packaging scripts because it is EOL
Upstream-commit: d88b3626fe6e6eeebac17f6d83d5378490ee997e
Component: packaging
2017-08-30 20:23:22 -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
d637802b2c
Merge pull request #43 from seemethere/add_ppc64le
...
Adds ppc64le builds for ubuntu zesty
Upstream-commit: 093ae20dd0124fbcc7756f8452e5c7006743498c
Component: packaging
2017-08-30 17:28:57 -07:00
e7ed69be1f
Merge pull request #213 from andrewhsu/v
...
update version to 17.09.0-dev
2017-08-30 17:21:53 -07:00
cace4119ad
Merge pull request #212 from andrewhsu/cl
...
update changelog for upcoming 17.09.0 release
2017-08-30 17:21:42 -07:00
f7460e2cd7
update version to 17.09.0-dev
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-08-30 17:09:30 -07:00
bc78d44351
update changelog for upcoming 17.09.0 release
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-08-30 16:55:01 -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
cd6cac51ad
Merge pull request #32 from tophj-ibm/add-ppc64le-support-xenial
...
[ppc64le] add deb support for ubuntu-xenial
Upstream-commit: 53b3255dbeea0288fc3c8c02e4ad3cab56d2521e
Component: packaging
2017-08-30 13:05:52 -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
2dd395d190
Merge pull request #34669 from dnephin/cleanup-registry-client-2
...
Remove command line flag install from registry package
Upstream-commit: 73a5e7b5c75023263e90b830944a45f0723df6a1
Component: engine
2017-08-29 16:54:08 -07:00
44d38eb2ce
Merge pull request #482 from dnephin/add-ulimit-to-unsupported
...
Add ulimits to unsupported compose fields
Upstream-commit: 65202d669a
2017-08-29 19:26:36 -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
a174528496
Merge pull request #480 from dnephin/remove-unnecessary-deps
...
Remove 5k lines of unnecessary dependencies
Upstream-commit: e6006219ab
2017-08-29 10:37:43 -07: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
b55202146c
Merge pull request #476 from dnephin/small-cleanup-to-two-formatters
...
Reduce complexity of image formatter
Upstream-commit: 6780c29d6e
2017-08-29 12:04:43 -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
5fa8a99c76
Merge pull request #34653 from tonistiigi/fix-readbody-test
...
integration-cli: fix testutil refactor merge conflict
Upstream-commit: 765e543a385bef1174bc73e98b59af1c81b29b45
Component: engine
2017-08-28 15:37:55 -07:00
