Victor Vieux
54efaca689
Merge pull request #34707 from vieux/force_format
...
force inspect test format
Upstream-commit: d7b4c7e0eac223eda54940adbb4c44bf71ec039c
Component: engine
2017-09-05 13:35:07 -07:00
Yong Tang
f109c25168
Merge pull request #34682 from dnephin/fail-build-on-integration-suite
...
Fix integration suite and propagate failures
Upstream-commit: 975675e9245e1d9a18cae978a0231ff83772048b
Component: engine
2017-09-05 12:40:00 -07:00
Harald Albers
8570202308
Add bash completion for dockerd --network-control-plane-mtu
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 36068e8763
Component: cli
2017-09-05 21:29:44 +02:00
Daniel Nephin
33d6fdcfda
Merge pull request #353 from albers/completion-nodelist
...
Use native formatting in bash completion of nodes
Upstream-commit: 0426ea1443
Component: cli
2017-09-05 15:09:00 -04:00
Daniel Nephin
28cf6767d3
Merge pull request #424 from simonferquel/update-vendoring
...
updated vendoring
Upstream-commit: 5c5cdd0e36
Component: cli
2017-09-05 15:06:09 -04:00
Daniel Nephin
56b8d8a2a0
Remove version from bundle path
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: bac2447964c8cdfcf35f928841d60310db997c76
Component: engine
2017-09-05 13:38:32 -04:00
Victor Vieux
33179f56a2
force inspect test format
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 8e6567cb837e1c885de5146517557c7a5d8a5f17
Component: engine
2017-09-05 08:31:44 -07:00
Daniel Nephin
e76adc6a0e
Merge pull request #406 from ksouf/issue_37_network_list_test
...
adding network list test
Upstream-commit: ec99774a85
Component: cli
2017-09-05 11:24:32 -04:00
Simon Ferquel
30986cbc05
Avoid failing the test if container is already stopped
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: adf75503dba2e782139173c011999eacd0c3d7e2
Component: engine
2017-09-05 17:19:57 +02:00
Harald Albers
2f974e7293
Add bash completion for search --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f6219ac3c6
Component: cli
2017-09-04 18:21:47 +02:00
Carlo Mion
55c903723c
Add support for .Node.Hostname templating in swarm services
...
Signed-off-by: Carlo Mion <mion00@gmail.com >
Upstream-commit: e2f09fa6dd1705eb69ab97fbf759253a4162228a
Component: engine
2017-09-02 10:06:16 +02:00
Andrew Hsu
f6c2d4d077
Merge component 'engine' from git@github.com:moby/moby master
2017-09-01 17:28:12 -07:00
Daniel Nephin
444c2e65a4
Remove unused depdendencies from vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 724f03bb23
Component: cli
2017-09-01 19:41:06 -04:00
Simon Ferquel
4bafd44516
updated vendoring
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: a0113c3a44
Component: cli
2017-09-01 19:41:06 -04:00
Andrew Hsu
adef76604d
Merge component 'cli' from git@github.com:docker/cli master
2017-09-01 16:25:12 -07:00
Andrew Hsu
5a2228df09
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-09-01 16:10:15 -07:00
Eli Uriegas
0699e6b42a
Allows VERSION to be overwritten by env variable
...
VERSION was hardcoded to be used as the `VERSION` file from the root
directory, this makes it so that you have the option to overwrite this.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 76643025793ca742b1c19bd35cab35c8ff7d3e77
Component: engine
2017-09-01 15:47:15 -07:00
Victor Vieux
80e330e43c
Merge pull request #34706 from dnephin/fix-ci-master
...
Fix lint errors on master
Upstream-commit: 9b4a616e4b3819ef062780b5fd854616be2c22bb
Component: engine
2017-09-01 15:45:32 -07:00
Eli Uriegas
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
French Ben
ee07288be3
Move output of stack rm to stdout
...
Signed-off-by: French Ben <frenchben@docker.com >
Update for the test to capture the proper removal
Signed-off-by: French Ben <frenchben@docker.com >
Satisfy lint length limit
Signed-off-by: French Ben <frenchben@docker.com >
Updated e2e test
Signed-off-by: French Ben <frenchben@docker.com >
Upstream-commit: bb8f49773c
Component: cli
2017-09-01 14:25:20 -07:00
Nishant Totla
2578773887
Clear Architecture field in platform constraint for arm architectures
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 772af6040ed4f2f26c22901597333a900be17aae
Component: engine
2017-09-01 13:08:20 -07:00
Brian Goff
7ded486a94
Merge pull request #34700 from tklauser/pkg-term-winsize
...
pkg/term: use IoctlGetWinsize/IoctlSetWinsize from golang.org/x/sys/unix
Upstream-commit: a127269803b9053713cd51d20f4ae00dae19b6d1
Component: engine
2017-09-01 15:58:25 -04:00
Daniel Nephin
7ecd17f5d0
Fix lint errors.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d0dbf8e397afe0365be59f98e5f52bb4d8d3f4e5
Component: engine
2017-09-01 15:12:22 -04:00
Julien Maitrehenry
d99a5ff6bf
Change sshfs by cloudstor on Installing and using a plugin
...
Signed-off-by: Julien Maitrehenry <julien.maitrehenry@me.com >
Upstream-commit: e97d72334f
Component: cli
2017-09-01 14:42:01 -04:00
Yong Tang
ec509204fd
Merge pull request #34689 from chchliang/envunitest
...
add an exception case
Upstream-commit: a301f96df6f951027a0c795e9d72ef657b51c2f9
Component: engine
2017-09-01 10:53:42 -07:00
Daniel Nephin
58ef7a0132
Fix integration suite and propagate failures
...
Failures from the integration suite were not propagating to the outter shell
for some reason. Handle the failure with an if exit 1.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 96707bc600747257e82917ca079fa5006d636b2c
Component: engine
2017-09-01 13:07:47 -04:00
Yong Tang
8ef302a435
Merge pull request #34625 from dnephin/more-linters
...
Add interfacer and unconvert linters
Upstream-commit: cb952bf00695b3429476f59c5534a9c604c6f010
Component: engine
2017-09-01 08:46:08 -07:00
Tobias Klauser
2be7b6733b
pkg/term: use IoctlGetWinsize/IoctlSetWinsize from golang.org/x/sys/unix
...
Use unix.IoctlGetWinsize and unix.IoctlSetWinsize instead of manually
reimplementing them.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch >
Upstream-commit: 32dfc0cb64992aa5e208273658b6e404268c63f4
Component: engine
2017-09-01 14:43:09 +02:00
chchliang
4e9d201c36
add an exception case and map changge to struct with expect error
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
add an exception case and map changge to struct with expect error
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: 76e9f0d6d45d7464c34223c25337128530b1a0c6
Component: engine
2017-09-01 15:49:56 +08:00
Flavio Crisciani
35c8905315
Vendoring libnetwork
...
Diff:
https://github.com/docker/libnetwork/compare/5b28c0ec98236c489e39ae6a9e1aeb802e071681...d5c822319097cc01cc9bd5ffedd74c7ce7c894f2
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 1ddeb11835600127a3319fc0dd3764e57ffbf521
Component: engine
2017-08-31 19:10:23 -07:00
Victor Vieux
f119dacce1
Merge pull request #485 from seemethere/re_add_test_target
...
Re-adds test target to the Makefile
Upstream-commit: d861a1c3dd
Component: cli
2017-08-31 17:50:14 -07:00
Andrew Hsu
dfa6a23587
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-08-31 17:11:47 -07:00
Eli Uriegas
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
Andrew Hsu
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
Andrew Hsu
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
Daniel Nephin
6742eeff7c
Remove assertions that were testing CLI behaviour.
...
These tests will be moved to docker/cli
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6590ee0dfba45d7eb4ee12f72621b90294925f20
Component: engine
2017-08-31 18:19:17 -04:00
Daniel Nephin
d48b9a840a
Merge pull request #489 from dnephin/fix-container-run
...
Fix crash in container run after pulling an image
Upstream-commit: d817967647
Component: cli
2017-08-31 18:11:26 -04:00
Daniel Nephin
5ed8076112
Merge pull request #484 from ripcurld0/ps_exit_1
...
When nothing found in stack exit with exit code 1
Upstream-commit: 5a9bf7f359
Component: cli
2017-08-31 17:13:00 -04:00
Daniel Nephin
264557313d
Fix crash in containe run after pulling an image.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a0d8d80250
Component: cli
2017-08-31 17:08:02 -04:00
Eli Uriegas
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
Component: cli
2017-08-31 10:32:00 -07:00
Yong Tang
c7214e3099
Merge pull request #34656 from dnephin/move-testenv-to-internal
...
Move integration-cli/environment to an internal package
Upstream-commit: 184cea5ff710abde25547749e5608b24a255ba09
Component: engine
2017-08-31 08:52:24 -07:00
Andrew Hsu
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
Andrew Hsu
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
Andrew Hsu
8c93ab2869
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-08-30 19:20:19 -07:00
Andrew Hsu
9dabee631f
Merge component 'engine' from git@github.com:moby/moby master
2017-08-30 16:44:42 -07:00
Andrew Hsu
5a06fdc713
Merge component 'cli' from git@github.com:docker/cli master
2017-08-30 15:35:48 -07:00
Andrew Hsu
ac255fc662
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-08-30 15:29:29 -07:00
Tycho Andersen
3c0eab373a
bump runc version
...
This picks up 66eb2a3e8fc930e1bb6703561152edf5ab550bff, which fixes
readonly containers in user namespaces.
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: 47e9d856c43b6b251d86afc099ec092aa83b1534
Component: engine
2017-08-30 14:26:59 -07:00
Boaz Shuster
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
Component: cli
2017-08-30 23:25:36 +03:00
Eli Uriegas
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