toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,677 Commits 3 Branches 295 Tags
ee1fbd1db2c6cd6b09709e25a713bd0adabc78b9
Commit Graph
41677 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle ee1fbd1db2 Merge component 'cli' from git@github.com:docker/cli master 2018-07-20 16:41:41 +00:00
Sebastiaan van Stijn 957aa92a67 Merge pull request #1226 from thaJeztah/harder_better_slower_stronger 
Bump version to 18.09.0-dev
Upstream-commit: 543d6fb8da
Component: cli
 2018-07-20 10:30:41 +02:00
Sebastiaan van Stijn 243d4a2f49 Bump version to 18.09.0-dev 
Releases will be supported for a longer term, and
will be done on a 6-month(ish) cycle.

https://blog.docker.com/2018/07/extending-support-cycle-docker-community-edition/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7fba38acad
Component: cli
 2018-07-20 10:14:32 +02:00
GordonTheTurtle 7a97868409 Merge component 'engine' from git@github.com:docker/engine master 2018-07-19 13:08:12 +00:00
Sebastiaan van Stijn 2753c62859 Merge pull request #37499 from kolyshkin/ct-go-111 
vendor: bump google/certificate-transparency-go to 1.0.20
Upstream-commit: 683738900eec52f86b834234eeef054c4e135031
Component: engine
 2018-07-19 14:06:07 +02:00
Sebastiaan van Stijn 9e7eb9d07a Merge pull request #37500 from kolyshkin/osusergo 
Add osusergo build tar for static binaries
Upstream-commit: 24711b7eba4471170301ca0d8cb40451dda2495d
Component: engine
 2018-07-19 13:57:44 +02:00
Kir Kolyshkin 197ec1c2ab Add osusergo build tar for static binaries 
Go 1.11 includes a fix to os/user to be working in a static binary
(fixing https://github.com/golang/go/issues/23265). The fix requires
`osusergo` build tag to be set for static binaries, which is what
this commit adds (also for containerd).

[v2: sort build tags alphabetically]

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 70cdb1c66429582ecfdc5abed67189dd90ab7572
Component: engine
 2018-07-19 12:25:46 +03:00
Kir Kolyshkin 2a78eeac5b vendor: bump google/certificate-transparency-go to 1.0.20 
This is to include the Windows + Go1.11 fix
(https://github.com/google/certificate-transparency-go/issues/284).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: dacefc32b27816c26caeba713b88f6767d2486d7
Component: engine
 2018-07-19 10:47:53 +03:00
GordonTheTurtle 0761ac7d2d Merge component 'engine' from git@github.com:docker/engine master 2018-07-19 01:04:46 +00:00
Sebastiaan van Stijn 0606266d6e Merge pull request #37467 from thaJeztah/bump_containerd_1.1.2 
Bump containerd daemon to v1.1.2
Upstream-commit: 7f91801cc86ea6be117fad9c11080fe1702ad96f
Component: engine
 2018-07-18 22:29:23 +02:00
GordonTheTurtle 687d8eed17 Merge component 'engine' from git@github.com:docker/engine master 2018-07-18 17:07:02 +00:00
Sebastiaan van Stijn 6f81e7d4d9 Merge pull request #37483 from thaJeztah/fix-nit-pick 
Use constant for task runtime value
Upstream-commit: cc7cda1968062fc6dde28c93e85a0192d58b6d90
Component: engine
 2018-07-18 17:31:44 +02:00
GordonTheTurtle f78dc3e804 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-07-18 01:05:28 +00:00
GordonTheTurtle b1a209fcca Merge component 'engine' from git@github.com:docker/engine master 2018-07-18 01:05:20 +00:00
Eli Uriegas 676377e3f3 Merge pull request #122 from seemethere/remove_artful 
Remove Ubuntu Artful (17.10)
Upstream-commit: bfc221bc25df21890d10cc52c54285f1ac0a3392
Component: packaging
 2018-07-17 15:26:57 -07:00
Brian Goff e9484ed940 Merge pull request #37484 from thaJeztah/bump_swarmkit 
Update swarmkit to 68266392a176434d282760d2d6d0ab4c68edcae6
Upstream-commit: 25ec60d3cdc14a444f54b741a65ef5ef199844a2
Component: engine
 2018-07-17 15:12:00 -07:00
GordonTheTurtle 2471a85618 Merge component 'engine' from git@github.com:docker/engine master 2018-07-17 21:08:01 +00:00
Tibor Vass 1244bbdf28 Merge pull request #37439 from tiborvass/vendor-buildkit 
Set BuildKit's ExportedProduct variable to show useful errors in the future
Upstream-commit: 9ebed53c5431a7c8296107869f1b3feabee9e8f3
Component: engine
 2018-07-17 12:10:23 -07:00
Sebastiaan van Stijn 6bdc6fed4e Update swarmkit to 68266392a176434d282760d2d6d0ab4c68edcae6 
changes included:

- swarmkit #2706 address unassigned task leak when service is removed
- swarmkit #2676 Fix racy batching on the dispatcher
- swarmkit #2693 Fix linting issues revealed by Go 1.11

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c9377f45529d5dce21c264947b73c7053f316467
Component: engine
 2018-07-17 20:55:07 +02:00
Sebastiaan van Stijn 58b60f8a46 Use constant for task runtime value 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2b7d34977e72054d197a481a10addd773aa23ca4
Component: engine
 2018-07-17 20:41:25 +02:00
Sebastiaan van Stijn b67ec60ca6 Merge pull request #37477 from thaJeztah/fix_TestExternalGraphDriver_pull 
Fix flaky TestExternalGraphDriver/pull test
Upstream-commit: 8f683c6ed5395872656ace8d8b1b5ebfbb2a6de1
Component: engine
 2018-07-17 20:36:22 +02:00
GordonTheTurtle 5087c7a333 Merge branch 'master' of github.com:docker/docker-ce 2018-07-17 17:09:57 +00:00
GordonTheTurtle 2885186d20 Merge component 'cli' from git@github.com:docker/cli master 2018-07-17 16:43:01 +00:00
GordonTheTurtle 6e8656ba72 Merge component 'cli' from git@github.com:docker/cli master 2018-07-17 16:40:18 +00:00
Sebastiaan van Stijn 724ab95ba8 Merge pull request #1216 from justyntemme/patch-4 
Update deploy.go
Upstream-commit: 48fbb12b7c
Component: cli
 2018-07-17 16:20:46 +02:00
Justyn Temme 8dee127b92 Update deploy.go 
Clarified ambiguous error message

Update kubernetes/cli.go

Infromed user of why the error was caused when file is not there

Signed-off-by: Justyn Temme <justyntemme@gmail.com>
Upstream-commit: bdd58a4096
Component: cli
 2018-07-17 09:14:05 -05:00
Sebastiaan van Stijn bb64046f90 Fix flaky TestExternalGraphDriver/pull test 
This test occassionally fails on s390x and Power;

    03:16:04 --- FAIL: TestExternalGraphDriver/pull (1.08s)
    03:16:04 external_test.go:402: assertion failed: error is not nil: Error: No such image: busybox:latest

Most likely these failures are caused due to Docker Hub updating
the busybox:latest image, but not all architectures yet being
available.

Instead of using `:latest`, pull an image by digest, so that
the test doesn't depend on Docker Hub having all architectures
available for `:latest`.

I selected the same digest as is currently used as "frozen image"
in the Dockerfile.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 352db26d5fd896b681046b1119f07e0ce1ed45b8
Component: engine
 2018-07-17 10:45:33 +02:00
Tibor Vass 3b5e16f319 validate: please vet 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 81599222fc8f8a845b68ca15f3582e76de24a7b3
Component: engine
 2018-07-16 21:41:54 +00:00
Tibor Vass 5dc7f8fc9b builder: set buildkit's exported product variable via PRODUCT 
This introduces a PRODUCT environment variable that is used to set a constant
at dockerversion.ProductName.

That is then used to set BuildKit's ExportedProduct variable in order to show
useful error messages to users when a certain version of the product doesn't
support a BuildKit feature.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 195919d9d645aa4ab5680a2331c57ff33eb9e5d9
Component: engine
 2018-07-16 21:41:54 +00:00
Tibor Vass adc3470981 vendor: buildkit to 98f1604134f945d48538ffca0e18662337b4a850 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 0ab7c1c5bacdf8b18c66b729bb7f919f6acfcf29
Component: engine
 2018-07-16 21:41:53 +00:00
GordonTheTurtle b53f1ce26a Merge component 'engine' from git@github.com:docker/engine master 2018-07-16 17:04:53 +00:00
GordonTheTurtle 22767a6190 Merge component 'cli' from git@github.com:docker/cli master 2018-07-16 16:41:25 +00:00
Vincent Demeester 4a2ba80f95 Merge pull request #37457 from adshmh/migrate-docker_cli_config_create_test-integration-tests-to-integration-config 
moved integration tests from docker_cli_config_create_test.go to integration/config
Upstream-commit: a5495f289aafafac8a01c62f2a9cb44856658ece
Component: engine
 2018-07-16 14:00:44 +02:00
Vincent Demeester 1d3ba53158 Merge pull request #1019 from ktomk/fix-env-file 
import environment variables that are present
Upstream-commit: 9e71207327
Component: cli
 2018-07-16 13:41:29 +02:00
Sebastiaan van Stijn df467b49b6 Merge pull request #1192 from peter-kehl/master 
For docker/docker.github.io/issues/6987
Upstream-commit: 7b82276c88
Component: cli
 2018-07-16 12:22:02 +02:00
Sebastiaan van Stijn 2fe05a785a Bump containerd daemon to v1.1.2 
Updates cri version to 1.0.4, to add `max-container-log-line-size`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9e773a12fb1cc5da7bec13d46fe04673a4593632
Component: engine
 2018-07-16 12:02:15 +02:00
Yong Tang 3fa9808e55 Merge pull request #37396 from yui-knk/error_when_base_name_resolved_to_blank 
Return error if basename is expanded to blank
Upstream-commit: 492545e139e7461aac044149a931bb4b2dd48f75
Component: engine
 2018-07-15 15:42:57 -07:00
Yuichiro Kaneko 900616b995 Return error if basename is expanded to blank 
Fix: https://github.com/moby/moby/issues/37325

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
Upstream-commit: c9542d313e2a52807644742e5fd684bc2de9f507
Component: engine
 2018-07-15 22:29:03 +09:00
Yong Tang ef023f77a6 Merge pull request #37454 from thaJeztah/swagger-lint 
Fix golint warning on generated "volume" types
Upstream-commit: 17dc10123f001d1481e4047de211c8aec7ed9d34
Component: engine
 2018-07-14 12:46:26 -07:00
Akihiro Suda 29bb93b3d8 Merge pull request #37449 from thaJeztah/in_a_different_context 
Remove stray uses of "golang.org/x/net/context"
Upstream-commit: d080de7074a05a1534bf7e91d000a311885fa221
Component: engine
 2018-07-15 01:15:36 +09:00
Tibor Vass 3c9a878585 Merge pull request #37451 from thaJeztah/refactor_system_info 
Refactor daemon.info to reduce cyclomatic complexity
Upstream-commit: a2a1d04bcae54129b5c4ddad4e4f68458fb5ef3d
Component: engine
 2018-07-13 16:47:28 -07:00
Yong Tang bd376a2767 Merge pull request #37455 from fcrisciani/fix-internal 
Fix flakyness in TestDockerNetworkInternalMode
Upstream-commit: 126d038831dccf82bdcd1a19ee765e89bc07fcd7
Component: engine
 2018-07-13 15:26:05 -07:00
Arash Deshmeh 14ed98c1a4 moved integration tests from docker_cli_config_create_test.go to integration/config 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: 0e57ceae0dd42491ed81538bf4d9164218080b66
Component: engine
 2018-07-13 17:29:02 -04:00
Flavio Crisciani 5fea4ae591 Fix flakyness in TestDockerNetworkInternalMode 
Instead of waiting for the DNS to fail, try to access
a specific external IP and verify that 100% of the pakcets
are being lost.

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: a2bb2144b3e0d49ac615976bfac462a307d85f0e
Component: engine
 2018-07-13 11:43:38 -07:00
GordonTheTurtle 2ec1cede27 Merge component 'engine' from git@github.com:docker/engine master 2018-07-13 17:05:21 +00:00
GordonTheTurtle 9ec201f089 Merge component 'cli' from git@github.com:docker/cli master 2018-07-13 16:41:28 +00:00
Sebastiaan van Stijn d1e4c2c766 Fix golint warning on generated "volume" types 
Should fix

```
api/types/volume/volume_create.go
Line 10: warning: comment on exported type VolumeCreateBody should be of the form "VolumeCreateBody ..." (with optional leading article) (golint)

api/types/volume/volume_list.go
Line 12: warning: comment on exported type VolumeListOKBody should be of the form "VolumeListOKBody ..." (with optional leading article) (golint)
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bd06a5ea4df919ff323510fba10801b5673a3af6
Component: engine
 2018-07-13 16:58:59 +02:00
Silvin 95d9ce4032 Merge pull request #1212 from thaJeztah/bump_circleci_docker 
Update CircleCI Docker version to 18.03
Upstream-commit: b395d2d6f5
Component: cli
 2018-07-13 15:13:40 +02:00
Sebastiaan van Stijn c1dba76a94 Unexport daemon.FillPlatformInfo 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c03d3a416b24c18dfbb938397052eebd8b67d1a3
Component: engine
 2018-07-13 13:16:34 +02:00
Sebastiaan van Stijn 91b7b13fc2 Refactor daemon.info to reduce cyclomatic complexity 
Before this change;

    gocyclo daemon/info.go
    17 daemon (*Daemon).SystemInfo daemon/info.go:27:1
    2 daemon (*Daemon).SystemVersion daemon/info.go:150:1
    1 daemon (*Daemon).showPluginsInfo daemon/info.go:195:1

After this change;

    gocyclo daemon/info.go
    8 daemon (*Daemon).fillSecurityOptions daemon/info.go:150:1
    5 daemon operatingSystem daemon/info.go:201:1
    3 daemon (*Daemon).fillDriverInfo daemon/info.go:121:1
    2 daemon hostName daemon/info.go:172:1
    2 daemon memInfo daemon/info.go:192:1
    2 daemon kernelVersion daemon/info.go:182:1
    1 daemon (*Daemon).SystemVersion daemon/info.go:81:1
    1 daemon (*Daemon).SystemInfo daemon/info.go:27:1
    1 daemon (*Daemon).fillPluginsInfo daemon/info.go:138:1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 50eaed4d0c1492479ed4d83eb97424d21a3e458d
Component: engine
 2018-07-13 13:10:05 +02:00