toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,794 Commits 3 Branches 295 Tags
cd93f23d9c32bc8929cc86bcfa68d9524539246d
Commit Graph

41794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle
cd93f23d9c Merge component 'engine' from git@github.com:docker/engine master 2018-08-02 17:02:15 +00:00
GordonTheTurtle
1ae49cf365 Merge component 'cli' from git@github.com:docker/cli master 2018-08-02 16:36:50 +00:00
Sebastiaan van Stijn
a727cc8ee8 Merge pull request #1262 from vdemeester/allow-custom-pattern 
Allow custom pattern when extracting variable…
Upstream-commit: ff1a34d9a9
Component: cli
 2018-08-02 18:00:38 +02:00
Sebastiaan van Stijn
c1168064aa Merge pull request #1254 from albers/completion-kubernetes 
Add bash completion for kubernetes orchestrator
Upstream-commit: 731b4f1fb4
Component: cli
 2018-08-02 17:30:31 +02:00
Vincent Demeester
4cbdb398d7 Allow custom pattern when extracting variable… 
… as it is possible to do it when interpolating. It also fixes when
there is 2 variables on the same *value* (in the composefile, on the
same line)

Finaly, renaming the default, used in cli, pattern to `defaultPattern`
to not be shadowed unintentionally.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4c87725c35
Component: cli
 2018-08-02 16:50:40 +02:00
Sebastiaan van Stijn
e08a81b044 Merge pull request #37541 from yongtang/07282018-ipc-container 
Migrate some ipc container test from integration-cli to integration
Upstream-commit: 75fe41444009947d319f76e68b5e1f2124c79b4d
Component: engine
 2018-08-02 15:51:25 +02:00
GordonTheTurtle
f2b2ca3774 Merge component 'cli' from git@github.com:docker/cli master 2018-08-02 12:36:56 +00:00
Harald Albers
841a592280 Add bash completion for kubernetes orchestrator 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 08f8ee1320
Component: cli
 2018-08-02 13:54:31 +02:00
Harald Albers
907c1bdfa8 Only complete swarm specific options with orchestrator=swarm 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8ef01e869e
Component: cli
 2018-08-02 13:54:31 +02:00
Harald Albers
19734fb410 Add support for orchestrator specific bash completions 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ff953751d3
Component: cli
 2018-08-02 13:54:31 +02:00
Sebastiaan van Stijn
5f6d6806ac Merge pull request #1251 from silvin-lubecki/fix-stack-help-command 
Fix help message flags on docker stack commands and sub-commands
Upstream-commit: 4fbb009d39
Component: cli
 2018-08-02 13:10:36 +02:00
GordonTheTurtle
66b7137cbd Merge component 'engine' from git@github.com:docker/engine master 2018-08-02 01:02:21 +00:00
Yong Tang
a055aa9d40 Migrate some ipc container test from integration-cli to integration 
This fix migrates some ipc container tests from integration-cli
to integration test.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 80c92c9b692b79273200b6e37f14a6d4e984ab8d
Component: engine
 2018-08-01 21:51:45 +00:00
Sebastiaan van Stijn
f4ebc73a60 Merge pull request #37465 from Russtopia/master 
namesgenerator: new adjective, two inspiring Computing Science authors
Upstream-commit: 09f5e9dae3b83ee9eaa09b8097134d5d4251fce8
Component: engine
 2018-08-01 23:50:05 +02:00
GordonTheTurtle
6e92e59096 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-08-01 21:04:19 +00:00
GordonTheTurtle
ff8bdfb5f9 Merge component 'engine' from git@github.com:docker/engine master 2018-08-01 21:04:10 +00:00
Tibor Vass
1e5cba450a Merge pull request #37489 from poizan42/fix-mips-no-pie 
-buildmode=pie is not supported on Linux on MIPS either
Upstream-commit: 724c5f317e0aabb3fb95933e5dd95ab9d71b5cdb
Component: engine
 2018-08-01 10:39:55 -07:00
docker-unir[bot]
7359851606 Merge pull request #126 from dhiltgen/image_build 
Merged with https://github.com/seemethere/unir
Upstream-commit: 1aa29931980e51171a57cae931de9cd17966dbb0
Component: packaging
 2018-08-01 17:28:21 +00:00
GordonTheTurtle
c8b3283839 Merge component 'cli' from git@github.com:docker/cli master 2018-08-01 16:36:51 +00:00
Silvin
ed3a613040 Merge pull request #1258 from wyckster/patch-2 
Fixed wrong apostrophe character
Upstream-commit: 261ff66d61
Component: cli
 2018-08-01 18:09:36 +02:00
wyckster
691f30bc72 Fixed wrong apostrophe character 
Changed unexpected Unicode character 0x1fbf GREEK PSILI that was standing in as an imposter for an apostrophe:  an _impostrophe_.

Signed-off-by: Chad Faragher <wyckster@hotmail.com>
Upstream-commit: b59823c784
Component: cli
 2018-08-01 11:06:07 -04:00
Daniel Hiltgen
f232ca8480 Switch image name on hub 
For the Q3 release the names will be refined slightly, and "ce" will no
longer be used - it's now just the docker engine, with "community" or
"enterprise" at the end if disambiguation is needed.
Upstream-commit: e69e4ea4997e468d20d93247ba19cd5e86daf24f
Component: packaging
 2018-08-01 08:03:20 -07:00
Vincent Demeester
52c1a41d81 Merge pull request #1249 from vdemeester/compose-template-pkg-enhancement 
Add a new `ExtractVariables` function to `compose/template` package
Upstream-commit: da544e8938
Component: cli
 2018-08-01 16:18:46 +02:00
Vincent Demeester
0bdf126d62 Add a new ExtractVariables function to compose/template package 
It allows to get easily all the variables defined in a
composefile (the `map[string]interface{}` representation that
`loader.ParseYAML` returns at least) and their default value too.

This commit also does some small function extract on substitution
funcs to reduce a tiny bit duplication.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: afb87e42f2
Component: cli
 2018-08-01 16:12:49 +02:00
Vincent Demeester
6951f936e1 Merge pull request #1256 from silvin-lubecki/update-reviewers 
Remove outdated completion reviewers file
Upstream-commit: 2093fd6e52
Component: cli
 2018-08-01 15:19:36 +02:00
Silvin Lubecki
d180792961 Remove outdated completion reviewers file 
Clean maintainers and code owners files

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 9022a00fbe
Component: cli
 2018-08-01 15:08:36 +02:00
Sebastiaan van Stijn
b6bdcc10a5 Merge pull request #37485 from fcrisciani/resolv 
Systemd-resolved proper handling
Upstream-commit: e1584514c15f6ad91b9ef5bc530a1eef46f18267
Component: engine
 2018-08-01 14:52:33 +02:00
Vincent Demeester
1e6a95f11f Merge pull request #37522 from vdemeester/bump-some-deps 
Bump a bunch of dependencies to more recent versions
Upstream-commit: 1dfcf4fe77e47d740939271aea516e11b5f9bcba
Component: engine
 2018-08-01 13:45:30 +02:00
Sebastiaan van Stijn
5483ae0078 Merge pull request #37573 from thaJeztah/windows-rs3-ci 
Temporarily disable failing tests on Windows RS3
Upstream-commit: 27f663a2532bb1b4c7fc375f8597d08064ce1890
Component: engine
 2018-08-01 12:16:12 +02:00
Vincent Demeester
14dcb25448 Bump a bunch of dependencies to more recent versions 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b0d108aa6ba4a52db1dd2bba0fd512903ab725ca
Component: engine
 2018-08-01 10:37:27 +02:00
Vincent Demeester
546812f824 Merge pull request #37438 from adshmh/fix-flaky-test-TestRunContainerWithBridgeNone 
fix the race condition in the integration test TestRunContainerWithBridgeNone
Upstream-commit: 9149ef67be8ac945d68fafb16a1aa4ccb2f72249
Component: engine
 2018-08-01 09:57:29 +02:00
Silvin Lubecki
ba693dc4c7 Fix help message flags on docker stack commands and sub-commands 
PersistentPreRunE needs to be called within the help function to initialize all the flags (notably the orchestrator flag)
Add an e2e test as regression test

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 21cce52b30
Component: cli
 2018-08-01 01:48:27 +02:00
John Stephens
ef87b4e0a0 Temporarily disable failing tests on Windows RS3 
Signed-off-by: John Stephens <johnstep@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1b05ea472703ddc47ec5052bc031fc23e60356c4
Component: engine
 2018-07-31 23:49:36 +02:00
GordonTheTurtle
ba6994fe02 Merge component 'cli' from git@github.com:docker/cli master 2018-07-31 20:37:42 +00:00
Sebastiaan van Stijn
42c10fc02b Merge pull request #1215 from albers/completion-service-logs-options 
Add bash completion for `service logs --details|--raw`
Upstream-commit: 08f5f52cdc
Component: cli
 2018-07-31 22:25:36 +02:00
Russ Magee
97d44663f5 Added additional scientists for balance per names-generator.go policy 
Signed-off-by: Russ Magee <rmagee@gmail.com>
Upstream-commit: 72a5e621e574aae8d374559867bf8a5c17d2387b
Component: engine
 2018-07-31 11:34:56 -07:00
Brian Goff
f13fff9319 Merge pull request #1246 from vdemeester/bump-mergo 
Bump mergo to v0.3.6
Upstream-commit: 24b7effa30
Component: cli
 2018-07-31 10:59:41 -07:00
Brian Goff
de583a8acb Merge pull request #36630 from AkihiroSuda/hijack-dialer 
client: add WithDialContext() and client.Dialer()
Upstream-commit: 562df8c2d6f48601c8d1df7256389569d25c0bf1
Component: engine
 2018-07-31 10:49:27 -07:00
Vincent Demeester
038c38eeb6 Merge pull request #37570 from kolyshkin/typpo 
loggerutils: fix a typo
Upstream-commit: 62739828d0bdf75b6dfc38e43d9d496c3da3db96
Component: engine
 2018-07-31 18:57:18 +02:00
GordonTheTurtle
9822d56542 Merge component 'cli' from git@github.com:docker/cli master 2018-07-31 16:36:41 +00:00
Silvin
99b63333cb Merge pull request #1248 from marcov/add-help-target 
Add `help` and remove `watch` targets in docker.Makefile
Upstream-commit: 74071f2347
Component: cli
 2018-07-31 16:52:07 +02:00
Kir Kolyshkin
a8fa741f70 loggerutils: fix a typo 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 2c6fbd864ae089e9cb544666949b8b2d897b3b23
Component: engine
 2018-07-31 15:44:46 +03:00
Marco Vedovati
eda72c01e5 Add help and remove watch targets in docker.Makefile 
* Add the `help` target to document make targets when building using a
container
* Remove the `watch` target (filewatcher was removed with c0588a9c) from
docker.Makefile and Makefile

Signed-off-by: Marco Vedovati <mvedovati@suse.com>
Upstream-commit: 760ca04709
Component: cli
 2018-07-31 14:38:51 +02:00
GordonTheTurtle
5bd951adc2 Merge component 'cli' from git@github.com:docker/cli master 2018-07-31 12:36:48 +00:00
Vincent Demeester
2514c7af88 Merge pull request #1247 from marcov/make-help 
Allow running `make help` without out-of-container warning
Upstream-commit: 7f853fee87
Component: cli
 2018-07-31 14:04:10 +02:00
Sebastiaan van Stijn
7007293101 Merge pull request #37567 from vdemeester/bump-mergo 
Bump mergo to v0.3.6
Upstream-commit: 9cf8feebbf9d94629882a14d77a2b73ce3b14b70
Component: engine
 2018-07-31 13:10:13 +02:00
Kasper Fabæch Brandt
63b2aa93fd -buildmode=pie is not supported on Linux on MIPS either 
Signed-off-by: Kasper Fabæch Brandt <poizan@poizan.dk>
Upstream-commit: daba5daf4fc76fe530f093125efe094c2dd93e8c
Component: engine
 2018-07-31 13:02:01 +02:00
Marco Vedovati
04c5e8c6df Allow running make help without out-of-container warning 
Signed-off-by: Marco Vedovati <mvedovati@suse.com>
Upstream-commit: 265dec037b
Component: cli
 2018-07-31 10:56:48 +02:00
GordonTheTurtle
928dc2de5e Merge component 'cli' from git@github.com:docker/cli master 2018-07-31 08:36:45 +00:00
Vincent Demeester
a87b47f24d Merge pull request #1242 from cyphar/buildmode-pie 
build: add -buildmode=pie
Upstream-commit: 40650cfbd5
Component: cli
 2018-07-31 10:09:11 +02:00