docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
4,518 Commits 12 Branches 296 Tags
8453ea8ddd268ce5ba1a31ab0099ee239a8bbde7
Commit Graph

4518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
8453ea8ddd Merge pull request #525 from thaJeztah/change-detach-default 
Use non-detached mode as default for service commands
Upstream-commit: e5aeb4b5e8
Component: cli
 2017-09-13 11:35:08 -04:00
Sebastiaan van Stijn
ad105d4aec Use non-detached mode as default for service commands 
Commit 330a0035334871d92207b583c1c36d52a244753f added a `--detach=false` option
to various service-related commands, with the intent to make this the default in
a future version (17.09).

This patch changes the default to use "interactive" (non-detached), allowing
users to override this by setting the `--detach` option.

To prevent problems when connecting to older daemon versions (17.05 and below,
see commit db60f25561), the detach option is
ignored for those versions, and detach is always true.

Before this change, a warning was printed to announce the upcoming default:

    $ docker service create nginx:alpine
    saxiyn3pe559d753730zr0xer
    Since --detach=false was not specified, tasks will be created in the background.
    In a future release, --detach=false will become the default.

After this change, no warning is printed, but `--detach` is disabled;

    $ docker service create nginx:alpine
    y9jujwzozi0hwgj5yaadzliq6
    overall progress: 1 out of 1 tasks
    1/1: running   [==================================================>]
    verify: Service converged

Setting the `--detach` flag makes the cli use the pre-17.06 behavior:

    $ docker service create --detach nginx:alpine
    280hjnzy0wzje5o56gr22a46n

Running against a 17.03 daemon, without specifying the `--detach` flag;

    $ docker service create nginx:alpine
    kqheg7ogj0kszoa34g4p73i8q

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0c27355f7b
Component: cli
 2017-09-13 12:27:55 +02:00
Tibor Vass
053e3db35e Merge pull request #528 from andrewhsu/ven 
vndr github.com/docker/docker to 84144a8 to fix stuff
Upstream-commit: f697de32b9
Component: cli
 2017-09-12 17:52:55 -07:00
Andrew Hsu
e18e2f39e3 vndr github.com/docker/docker to 84144a8 to fix stuff 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 850b46e67c
Component: cli
 2017-09-12 17:27:15 -07:00
Victor Vieux
eae7cc4c29 Merge pull request #516 from andrewhsu/v 
vndr docker/docker to ea220e7 to bring in fix for arm
Upstream-commit: b60413264d
Component: cli
 2017-09-12 16:01:04 -07:00
Andrew Hsu
baffbb54c8 remove unused vndr github.com/docker/libtrust 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 536da4a07a
Component: cli
 2017-09-12 13:48:21 -07:00
Andrew Hsu
fda4a38658 vndr golang.org/x/sys to 07c1829 
To satisfy requirements of the vndr of docker/docker

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 50696bbf72
Component: cli
 2017-09-12 12:11:18 -07:00
Misty Stanley-Jones
99e268ef3c Merge pull request #508 from docker/revert-493-patch-1 
Revert "Change sshfs by cloudstor on Installing and using a plugin"
Upstream-commit: 04390f8a74
Component: cli
 2017-09-11 11:25:50 -07:00
Vincent Demeester
599a2ae3b1 Merge pull request #521 from dnephin/add-albers-to-maintainers 
Add albers to maintainers
Upstream-commit: d0bda815d2
Component: cli
 2017-09-11 19:47:20 +02:00
Daniel Nephin
591014017f Add albers to maintainers. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 92cf825238
Component: cli
 2017-09-11 11:22:10 -04:00
Vincent Demeester
8e2757c531 Merge pull request #421 from thaJeztah/refactor-docker-info 
Refactor/cleanup of docker info
Upstream-commit: e77dc2232e
Component: cli
 2017-09-11 15:25:02 +02:00
Sebastiaan van Stijn
033298b8f6 Refactor/cleanup of docker info 
Some mild refactoring of the docker info command;

- Use `fmt.Fprinln()` instead of `fmt.Fprintf()` where possible
- Rename `fprintfIfNotEmpty()` to `fprintlnNonEmpty()`, and removed
  return variables, because they were not used. `fprintlnNonEmpty()`
  now uses fmt.Fprintln()` instead of `fmt.Fprintf()`, because
  formatting was not used.
- Use `fprintlnNonEmpty()` to get rid of some `if` statements
- Extract printing Swarm-related information to a `printSwarmInfo()` function
- Change `Http Proxy` and `Https Proxy` to `HTTP Proxy` / `HTTPS Proxy`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6f1b510843
Component: cli
 2017-09-11 15:13:06 +02:00
Sebastiaan van Stijn
95956aa7ef Merge pull request #519 from gesellix/typo-configration 
[docs] Fix typo in configration.
Upstream-commit: 202205365a
Component: cli
 2017-09-11 14:57:08 +02:00
Tobias Gesellchen
1b8f2ad866 [docs] Fix typo in configration. 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Upstream-commit: f8ed8d22c6
Component: cli
 2017-09-10 23:12:29 +02:00
Andrew Hsu
4b9c2f5fd5 vndr docker/docker to ea220e7 to bring in fix for arm 
Primarily to bring in fix for "Clear Architecture field in platform
constraint for arm architectures".

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: ef027b6d72
Component: cli
 2017-09-08 16:27:56 -07:00
Victor Vieux
30a4e0ab8e Merge pull request #510 from dnephin/add-parse-log-details 
Use a local copy of ParseLogDetails
Upstream-commit: aae519d0f6
Component: cli
 2017-09-08 11:38:24 -07:00
Victor Vieux
fbd21afa80 Merge pull request #511 from dnephin/fix-end-of-line-whitespace-tests 
Use golden files for tests that expect end-of-line whitespace
Upstream-commit: d3d9b38d55
Component: cli
 2017-09-08 11:37:28 -07:00
Victor Vieux
94dd311bdc Merge pull request #495 from dnephin/container-run-e2e 
Add en e2e test for `container run`
Upstream-commit: cc517f2d8a
Component: cli
 2017-09-08 11:36:32 -07:00
Daniel Nephin
d7ed53048b Use golden files for tests that expect end-of-line whitespace 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 51587de1c4
Component: cli
 2017-09-07 17:50:44 -04:00
Misty Stanley-Jones
56f259f37d Revert "Change sshfs by cloudstor on Installing and using a plugin" 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: eb77961399
Component: cli
 2017-09-07 10:15:59 -07:00
Daniel Nephin
0d3330814c Use a local copy of ParseLogDetails 
It's being removed from client/

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a747389bf4
Component: cli
 2017-09-07 12:50:25 -04:00
Misty Stanley-Jones
74473d87d6 Merge pull request #493 from jmaitrehenry/patch-1 
Change sshfs by cloudstor on Installing and using a plugin
Upstream-commit: af94015b8c
Component: cli
 2017-09-06 14:42:34 -07:00
Daniel Nephin
4a595ff1d9 Add an end-to-end test for container run 
for testing attach, remove, and pull image when missing.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c34360cc8e
Component: cli
 2017-09-06 17:07:38 -04:00
Daniel Nephin
6fc4c48771 Move common e2e things into an internal package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 677d17150a
Component: cli
 2017-09-06 17:07:38 -04:00
Daniel Nephin
e65a64c87e Add gotestyourself/poll 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 683b6226ed
Component: cli
 2017-09-06 17:07:35 -04: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
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
Vincent Demeester
09edca8b4e Merge pull request #491 from FrenchBen/fix-stack 
Move output of stack rm to stdout
Upstream-commit: 38c1895021
Component: cli
 2017-09-04 15:56:30 +02: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
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
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
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
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
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
Daniel Nephin
8bf4dec055 Merge pull request #475 from AliyunContainerService/start_period 
Support start_period for healthcheck in Docker Compose
Upstream-commit: e636a5388c
Component: cli
 2017-08-30 14:11:43 -04:00
Victor Vieux
8be8bd8ae1 Merge pull request #477 from dnephin/some-tests-for-container-command 
A few tests for container command
Upstream-commit: 8ea02f6f08
Component: cli
 2017-08-30 09:38:38 -07:00
Li Yi
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
Component: cli
 2017-08-30 23:39:12 +08:00
Daniel Nephin
44d38eb2ce Merge pull request #482 from dnephin/add-ulimit-to-unsupported 
Add ulimits to unsupported compose fields
Upstream-commit: 65202d669a
Component: cli
 2017-08-29 19:26:36 -04:00
Daniel Nephin
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
Component: cli
 2017-08-29 19:25:50 -04:00
Daniel Nephin
853b31143d Add ulimits to unsupported compose fields. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bdc8cf364e
Component: cli
 2017-08-29 17:05:16 -04:00
Tibor Vass
a174528496 Merge pull request #480 from dnephin/remove-unnecessary-deps 
Remove 5k lines of unnecessary dependencies
Upstream-commit: e6006219ab
Component: cli
 2017-08-29 10:37:43 -07:00
Daniel Nephin
4ac950c1d0 Remove unused vendor. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8edd2dd3df
Component: cli
 2017-08-29 13:22:17 -04:00
Daniel Nephin
ee93512169 Remove test for code not in this repo. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: dae1b7112c
Component: cli
 2017-08-29 13:19:28 -04:00
Daniel Nephin
b55202146c Merge pull request #476 from dnephin/small-cleanup-to-two-formatters 
Reduce complexity of image formatter
Upstream-commit: 6780c29d6e
Component: cli
 2017-08-29 12:04:43 -04:00
khaled souf
6eb6b7d9d2 adding network list test 
Signed-off-by: khaled souf <khaled.souf@gmail.com>
Upstream-commit: 15d92a9e03
Component: cli
 2017-08-29 16:30:37 +02:00