toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,237 Commits 3 Branches 295 Tags
700099159c70f396e76adca0ca832c864a138490
Commit Graph
8237 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn 700099159c update gotestsum to v1.8.2 
release notes: https://github.com/gotestyourself/gotestsum/releases/tag/v1.8.2

- Show shuffle seed
- Update tests, and cleanup formats
- Update dependencies
- Test against go1.19, remove go1.15
- Add project name to junit.xml output
- Adding in support for s390x and ppc64le

full diff: https://github.com/gotestyourself/gotestsum/compare/v1.8.1...v1.8.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 18:08:19 +01:00
Sebastiaan van Stijn da7bf25f52 Merge pull request #3835 from dvdksn/docs/inspect-size-example 
docs: docker inspect --size
 2022-11-17 16:46:42 +01:00
Sebastiaan van Stijn 099c5e7415 Merge pull request #3867 from thaJeztah/yaml_fixes 
Some fixes in handling YAML files, and updates to tests
 2022-11-17 16:20:37 +01:00
Sebastiaan van Stijn e064f893a6 docs: docker inspect --size 
Signed-off-by: David Karlsson <david.karlsson@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 14:26:35 +01:00
David Karlsson 802c53fa9d docs: docker inspect: reformat with prettier 
Signed-off-by: David Karlsson <david.karlsson@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 14:22:55 +01:00
Sebastiaan van Stijn bf3f419b6e cli/command/stack: TestConfigMergeInterpolation: various fixes 
- Make the package-level configMergeTests local to the test itself.
- Rename fields to better describe intent
- Remove some redundant variables
- Reverse "expected" and "actual" fields for consistency
- Use assert.Check() to not fail early

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 13:17:51 +01:00
Sebastiaan van Stijn 4d2fb68b93 cli/compose/loader: fix error messages, and various tests 
Various fixes:

- Don't capitalize error messages
- Rename variables that collided with imports or types
- Prefer assert.Check over assert.Assert to prevent tests covering multiple
  cases from failing early
- Fix inconsistent order of expected <--> actual, which made it difficult to
  check which output was the expected output.
- Fix formatting of some comments

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 13:17:51 +01:00
Sebastiaan van Stijn 5aba4860de cli-plugins/manager: TestPluginError: don't use yaml.Marshal 
The test used  `gopkg.in/yaml.v2` to verify the TextMarshaller implementation,
which was implemented to allow printing the errors in JSON formatted output;

> This exists primarily to implement encoding.TextMarshaller such that
> rendering a plugin as JSON (e.g. for `docker info -f '{{json .CLIPlugins}}'`)
> renders the Err field as a useful string and not just `{}`.

Given that both yaml.Marshal and json.Marshal use this, we may as well use
Go's stdlib.

While updating, also changed some of the assertions to checks, so that we don't
fail the test early.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 13:17:51 +01:00
Sebastiaan van Stijn 0644aa3906 cli/compose/types: UlimitsConfig.MarshalYAML() fix recursion 
When marshaling the type with `gopkg.in/yaml.v3`, unmarshaling would
recursively call the type's `MarshalYAML()` function, which ultimately
resulted in a crash:

    runtime: goroutine stack exceeds 1000000000-byte limit
    runtime: sp=0x140202e0430 stack=[0x140202e0000, 0x140402e0000]
    fatal error: stack overflow

This applies a similar fix as was implemented in e7788d6f9a
for the `MarshalJSON()` implementation. An alternative would be to use
a type alias (to remove the `MarshalYAML()`), but keeping it simple.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 13:17:51 +01:00
Sebastiaan van Stijn c18dd2719e cli/compose/loader: TestMarshallConfig: fix duplicate version 
The version was originally added in 570ee9cb54,
at the time the `expected` config did not have a `version:` field. A later
refactor in 0cf2e6353a updated the `expected`
config to have a `version:` included. However, the test was not updated,
which now resulted in the test using a compose file with a duplicate version
field:

    version: '3.10'
    version: "3.10"
      services:
        foo:
          build:

This issue was masked by `yaml.Unmarshal()` from `gopkg.in/yaml.v2` which
silently ignores the duplicate, taking the value of the last occurrence. When
upgrading to `gopkg.in/yaml.v3`, the duplicate value resulted in an error:

    yaml: unmarshal errors:
        line 2: mapping key "version" already defined at line 1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 13:17:50 +01:00
Sebastiaan van Stijn 2b7d10cf93 Merge pull request #3865 from thaJeztah/update_engine 
vendor: docker d15be0c54de92a4d868ebd66dbb1065e264554f2 / v22.06-dev
 2022-11-17 13:14:42 +01:00
Sebastiaan van Stijn 845f002d3c vendor: docker d15be0c54de92a4d868ebd66dbb1065e264554f2 / v22.06-dev 
full diff: https://github.com/docker/docker/compare/cd8873dd3d21b1fc1b957c98dcd0f5c7a507fb70...d15be0c54de92a4d868ebd66dbb1065e264554f2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 11:28:39 +01:00
Sebastiaan van Stijn 722cde068f vendor: golang.org/x/sys v0.2.0 
full diff: https://github.com/golang/sys/compare/v0.1.0...v0.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 11:01:16 +01:00
Sebastiaan van Stijn 275b7ddd12 vendor: github.com/sirupsen/logrus v1.9.0 
full diff: https://github.com/sirupsen/logrus/compare/v1.8.1...v1.9.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-17 10:59:56 +01:00
Sebastiaan van Stijn f51c4ff317 vendor: docker cd8873dd3d21b1fc1b957c98dcd0f5c7a507fb70 / v22.06-dev 
full diff: https://github.com/docker/docker/compare/5aac513617f072b15322b147052cbda0d451d389...cd8873dd3d21b1fc1b957c98dcd0f5c7a507fb70

no changes in vendored code

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 16:32:48 +01:00
Sebastiaan van Stijn 86038fdb68 vendor: github.com/containerd/containerd v1.6.10 
full diff: https://github.com/containerd/containerd/compare/v1.6.8...v1.6.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 16:32:17 +01:00
Sebastiaan van Stijn 88b33a667f vendor: github.com/moby/buildkit v0.10.6 
full diff: https://github.com/moby/buildkit/compare/v0.10.5...v0.10.6

no changes in vendored code

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 16:06:29 +01:00
Sebastiaan van Stijn af30079600 vendor: github.com/moby/swarmkit/v2 v2.0.0-20221102165002-6341884e5fc9 
full diff: https://github.com/moby/swarmkit/compare/48dd89375d0a...6341884e5fc9

no local changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 16:06:29 +01:00
Sebastiaan van Stijn 633ef7a093 vendor: golang.org/x/crypto v0.1.0 (fix OpenSSL > 9.3 compatibility) 
- fixes compatibility with OpenSSH >= 8.9 (https://github.com/moby/buildkit/issues/3273)
- relates to https://github.com/golang/go/issues/51689#issuecomment-1197085791

full diff: https://github.com/golang/crypto/compare/3147a52a75dd...v0.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 16:05:32 +01:00
Sebastiaan van Stijn 880b7fc671 vendor: golang.org/x/net v0.1.0 
The golang.org/x/ projects are now doing tagged releases.

full diff: https://github.com/golang/net/compare/f3363e06e74c...v0.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 16:02:41 +01:00
Sebastiaan van Stijn 0f568cfa97 vendor: golang.org/x/text v0.4.0 
full diff: https://github.com/golang/text/compare/v0.3.7...v0.4.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 16:00:18 +01:00
Sebastiaan van Stijn 63ea1e4242 vendor: golang.org/x/term v0.1.0 
full diff: https://github.com/golang/term/compare/03fcf44c2211...v0.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 15:58:54 +01:00
Sebastiaan van Stijn 57b6ed34cc vendor: golang.org/x/time v0.1.0 
The golang.org/x/ projects are now doing tagged releases.

full diff: https://github.com/golang/time/compare/1f47c861a9ac...v0.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 15:53:35 +01:00
Sebastiaan van Stijn 7b3900145e vendor: golang.org/x/sys v0.1.0 
The golang.org/x/ projects are now doing tagged releases.

full diff: https://github.com/golang/sys/compare/c680a09ffe643de9c0f058489ff1737c3ad41f05...v0.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-16 15:48:59 +01:00
Brian Goff 79dca7a38e Merge pull request #3676 from crazy-max/build-default-builder 
build: set default context builder if not specified
 2022-11-09 12:37:36 -08:00
Brian Goff 4011187b78 Merge pull request #3305 from crazy-max/rm-stream 
Cleanup leftovers for --stream build flag
 2022-11-09 11:57:38 -08:00
Sebastiaan van Stijn 86502f73aa Merge pull request #3852 from thaJeztah/update_gotest 
vendor: gotest.tools/v3 v3.4.0, github.com/google/go-cmp v0.5.9, remove golang.org/x/xerrors
 2022-11-07 14:28:47 +01:00
Sebastiaan van Stijn c312c85753 Merge pull request #3850 from thaJeztah/bump_go_1.19.3 
Update to Go 1.19.3 to address CVE-2022-41716
 2022-11-07 14:28:07 +01:00
Sebastiaan van Stijn c855e4ba3b vendor: gotest.tools/v3 v3.4.0 
- removes github.com/spf13/pflag dependency
- removes use of deprecated io/ioutil package
- drops support for go1.16

full diff: https://github.com/gotestyourself/gotest.tools/compare/v3.3.0...v3.4.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-05 23:25:29 +01:00
Sebastiaan van Stijn 46ba87dcf1 vendor: github.com/google/go-cmp v0.5.9 to remove golang.org/x/xerrors 
full diff: https://github.com/google/go-cmp/compare/v0.5.7...v0.5.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-05 23:24:04 +01:00
Sebastiaan van Stijn 85eee32f4c Update to Go 1.19.3 to address CVE-2022-41716 
On Windows, syscall.StartProcess and os/exec.Cmd did not properly
    check for invalid environment variable values. A malicious
    environment variable value could exploit this behavior to set a
    value for a different environment variable. For example, the
    environment variable string "A=B\x00C=D" set the variables "A=B" and
    "C=D".

    Thanks to RyotaK (https://twitter.com/ryotkak) for reporting this
    issue.

    This is CVE-2022-41716 and Go issue https://go.dev/issue/56284.

This Go release also fixes https://github.com/golang/go/issues/56309, a
runtime bug which can cause random memory corruption when a goroutine
exits with runtime.LockOSThread() set. This fix is necessary to unblock
work to replace certain uses of pkg/reexec with unshared OS threads.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-05 17:39:57 +01:00
Sebastiaan van Stijn 8a19043cc7 Merge pull request #3798 from thaJeztah/gofumpt_linting 
Use gofumpt if available, and enable gofumpt linter
 2022-11-04 19:04:51 +01:00
Sebastiaan van Stijn ceecf3048c Merge pull request #3841 from thaJeztah/bump_cobra 
go.mod: github.com/spf13/cobra v1.6.1
 2022-11-04 10:17:17 +01:00
CrazyMax 997846918e build: keep "buildx install" behavior 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-11-04 08:42:34 +01:00
CrazyMax d1cabdff99 build: set default context builder if not specified 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-11-04 08:42:34 +01:00
CrazyMax 8dec4bcce8 cleanup leftovers for --stream build flag 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-11-04 08:16:04 +01:00
Sebastiaan van Stijn d978d0dd5a go.mod: github.com/spf13/cobra v1.6.1 
full diff: https://github.com/spf13/cobra/compare/v1.5.0...v1.6.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-11-03 14:51:12 +01:00
Sam Thibault 3dfef7691e Merge pull request #3662 from dperny/cluster-volumes-compose 
Add compose support for cluster volumes
 2022-11-02 18:57:08 +01:00
Drew Erny 02e7826923 Add compose support for cluster volumes 
Signed-off-by: Drew Erny <derny@mirantis.com>
 2022-11-02 11:27:06 -05:00
Sam Thibault a3e047778b Merge pull request #3838 from dvdksn/docs/update-run-reference 
docs: update link to docker cp
 2022-11-02 11:38:35 +01:00
David Karlsson 7c0d6ecf64 docs: update link to docker cp 
Signed-off-by: David Karlsson <david.karlsson@docker.com>
 2022-10-31 20:24:44 +01:00
Sam Thibault 3ee1f48cb0 Merge pull request #3837 from dvdksn/docs/update-run-reference 
Docs: update run reference
 2022-10-31 14:56:43 +01:00
Djordje Lukic bfcadab0be docs: improved docker run cli reference 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
Signed-off-by: David Karlsson <david.karlsson@docker.com>
 2022-10-31 13:54:50 +01:00
Sebastiaan van Stijn 4e05b45a90 Merge pull request #3831 from crazy-max/fix-docs-links 
docs: fix links to BuildKit backend
 2022-10-25 13:28:02 -04:00
CrazyMax a7717513b3 docs: fix links to BuildKit backend 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
 2022-10-25 11:54:35 +02:00
Sebastiaan van Stijn 110c4d92b8 Merge pull request #3827 from thaJeztah/go1.18_compat 
vendor: docker 5aac513617f072b15322b147052cbda0d451d389 / v22.06-dev
 2022-10-22 00:52:14 +02:00
Sebastiaan van Stijn 67e6ba0d09 vendor: docker 5aac513617f072b15322b147052cbda0d451d389 / v22.06-dev 
This restores compatibility with go1.18, which was broken since commit;
https://github.com/moby/moby/commit/c062238ea4274e9af98cb96dcfe31a0dfc763440

cmd.Environ() is new in go1.19, and not needed for this specific case.
Without this, trying to use this package in code that uses go1.18 will fail;

    builder/remotecontext/git/gitutils.go:216:23: cmd.Environ undefined (type *exec.Cmd has no field or method Environ)

Changing to use `os.Environ()` instead restores compatibility with go1.18

Full diff: https://github.com/docker/docker/compare/f9cb47a052be6a5f73e3077773ffa6ccbde1285d...5aac513617f072b15322b147052cbda0d451d389

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-10-21 20:51:43 +02:00
Sebastiaan van Stijn 3eb9976a68 Merge pull request #3823 from thaJeztah/update_engine2 
vendor: docker v20.10.3-0.20221021122114-f9cb47a052b (22.06 branch)
 2022-10-21 16:09:20 +02:00
Sebastiaan van Stijn 5d78cc13a4 vendor: docker v20.10.3-0.20221021122114-f9cb47a052b (22.06 branch) 
full diff: https://github.com/docker/docker/compare/87d9d96ab0b693c2c83f7d1fd0f4037a9d1aa217...f9cb47a052be6a5f73e3077773ffa6ccbde1285d

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-10-21 15:37:21 +02:00
Sebastiaan van Stijn c4d3fa2aaf Merge pull request #3815 from thaJeztah/update_engine 
vendor: docker v20.10.3-0.20221006185438-87d9d96ab0b6 (v22.06-dev)
 2022-10-21 15:31:45 +02:00