dff328c8a6
Fix a bad assumption
...
If the empty variable happens to be sorted to the end of the list then TrimSpace()
would remove it. Instead only strip the single trailing newline.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
(cherry picked from commit fff605c3b3557acf6bf793813d695fba59d7fa21)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-09-07 11:40:46 -07:00
ae21824df8
Merge pull request #223 from seemethere/bump_17090rc1
...
[17.09] bump version to 17.09.0-ce-rc1
2017-09-06 15:22:01 -07:00
ec4c78a39b
Merge pull request #214 from vieux/17.09-changelog
...
[17.09] add 17.09 changelog
2017-09-06 15:21:47 -07:00
aa56783035
Merge pull request #224 from seemethere/fix_integration_tests_1709
...
[17.09] Changes error check form NotNil to IsNil
2017-09-06 15:18:32 -07:00
b33e8d49d4
Add skip for known failure
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-09-06 13:41:55 -07:00
5d1587e61e
Changes error check form NotNil to IsNil
...
rmi -f always returns a 0 exit code so these tests needed to be changed
accordingly.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-09-06 11:30:29 -07:00
8574cd6b8a
bump version to 17.09.0-ce-rc1
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-09-05 17:06:13 -07:00
54ddbdea25
Merge pull request #222 from vieux/fix_inspect
...
[17.09] Fix integration suite and propagate failures
2017-09-05 16:49:27 -07:00
efd69761fc
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 >
(cherry picked from commit 96707bc600747257e82917ca079fa5006d636b2c)
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2017-09-05 14:58:05 -07:00
c973c430a9
Merge pull request #220 from vieux/fix_nano_tests
...
[17.09] backport: force inspect test format
2017-09-05 14:43:58 -07:00
e3e65f6470
force inspect test format
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit 8e6567cb837e1c885de5146517557c7a5d8a5f17)
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2017-09-05 13:37:34 -07:00
f6c2d4d077
Merge component 'engine' from git@github.com:moby/moby master
2017-09-01 17:28:12 -07:00
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
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
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
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
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
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
f7ec4a69b3
add 17.09 changelog
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2017-09-01 10:32:17 -07:00
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
d0e9f9bfe2
Merge pull request #34695 from dnephin/fix-rename-integration-test
...
Remove assertions that were testing CLI behaviour
Upstream-commit: a337aaab08babcd7b5d70d91ad0c3c7ad16a649d
Component: engine
2017-09-01 10:18:43 -04:00
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
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
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
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
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
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
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
