Commit Graph

6597 Commits

Author SHA1 Message Date
Sebastiaan van Stijn a6c15a5e60
Replace vbom.ml/util with fvbommel/sortorder
The vanity domain is down, and the project has moved
to a new location.

vendor check started failing because of this:

    Collecting initial packages
    Download dependencies
    unrecognized import path "vbom.ml/util" (https fetch: Get https://vbom.ml/util?go-get=1: dial tcp: lookup vbom.ml on 169.254.169.254:53: no such host)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6703919c71)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-28 16:17:03 +02:00
Silvin Lubecki 80fd48bcb7
Merge pull request #2635 from thaJeztah/19.03_backport_bump_golang_1.13.14
[19.03 backport] Bump Golang 1.13.14
2020-07-21 15:05:41 +02:00
Sebastiaan van Stijn e5e227672b
Bump Golang 1.13.14
full diff: https://github.com/golang/go/compare/go1.13.13...go1.13.14

go1.13.14 (released 2020/07/16) includes fixes to the compiler, vet, and the
database/sql, net/http, and reflect packages. See the Go 1.13.14 milestone on
the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.14+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit cdfafe03e3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-17 17:07:06 +02:00
Sebastiaan van Stijn 79a6c494e5
Merge pull request #2633 from thaJeztah/19.03_backport_bump_golang_1.13.13
[19.03 backport] Bump Golang 1.13.13
2020-07-17 09:39:44 +02:00
Sebastiaan van Stijn 5e05ef3459
Merge pull request #2631 from cpuguy83/19.03_handle_close_error_on_save
[19.03] handle close error on save
2020-07-16 20:01:53 +02:00
Sebastiaan van Stijn 64d25cc6eb
Bump Golang 1.13.13
full diff: https://github.com/golang/go/compare/go1.13.12...go1.13.13

go1.13.13 (released 2020/07/14) includes security fixes to the crypto/x509 and
net/http packages. See the Go 1.13.13 milestone on the issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.13+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dc4f7fb375)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-16 15:47:06 +02:00
Silvin Lubecki 1b96aa29ca
Merge pull request #2629 from thaJeztah/19.03_backport_circleci_updates
[19.03 backport] CircleCI updates
2020-07-16 11:16:54 +02:00
Brian Goff aaf1170520 Handle errors on close in config file write.
I'm not sure if this fixes anything, however I have seen some weird
behavior on Windows where temp config files are left around and there
doesn't seem to be any errors reported.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit d02173090f)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-07-15 12:31:59 -07:00
Sebastiaan van Stijn 14010c88b4 config: preserve ownership and permissions on configfile
When running `docker login` or `docker logout`, the CLI updates
the configuration file by creating a temporary file, to replace
the old one (if exists).

When using `sudo`, this caused the file to be created as `root`,
making it inaccessible to the current user.

This patch updates the CLI to fetch permissions and ownership of
the existing configuration file, and applies those permissions
to the new file, so that it has the same permissions as the
existing file (if any).

Currently, only done for "Unix-y" systems (Mac, Linux), but
can be implemented for Windows in future if there's a need.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 22a291f703)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-07-15 12:31:56 -07:00
Sebastiaan van Stijn 3d64a5d4b0
Move circle.yml to .circleci/config.yml
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 77e78a2fea)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-15 18:24:20 +02:00
Sebastiaan van Stijn d0b6560881
CircleCI: update docker versions used in CI
CircleCI now has 19.03; https://circleci.com/docs/2.0/building-docker-images/#docker-version

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 41255a4315)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-15 18:23:51 +02:00
Brian Goff b0a78cc1ad
Merge pull request #2623 from s0j/s0j_19.03_bump-crypto-readconsole
[19.03 backport] vendor: golang.org/x/crypto 2aa609cf4a9d7d1126360de73b55b6002f9e052a
2020-07-09 11:58:42 -07:00
Shane Jarych ab8bd02fc0 vendor: golang.org/x/crypto 2aa609cf4a9d7d1126360de73b55b6002f9e052a
full diff: 69ecbb4d6d...2aa609cf4a

The cherry-pick didn't apply cleanly, so I took the single 'golang.org/x/crypto'
change in vendor.conf and re-ran vndr.

The motivation behind this is to address the input regression on Windows caused by:
6d4e4cb37c

.. and addressed in:
ecb85df213

(cherry picked from commit 37d184fe16)
Signed-off-by: Shane Jarych <sjarych@mirantis.com>
2020-07-09 11:54:18 -04:00
Silvin Lubecki 18d6f8f6bf
Merge pull request #2620 from thaJeztah/19.03_backport_builder_comment_info
[19.03 backport] docs/builder: add note about handling of leading whitespace
2020-07-09 15:11:24 +02:00
Sebastiaan van Stijn 7498d9cc49
docs/builder: add note about handling of leading whitespace
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6776f7cdcd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-06 13:37:08 +02:00
Silvin Lubecki cb59cafc3e
Merge pull request #2609 from thaJeztah/19.03_backport_docs_fixes
[19.03 backport] assorted docs fixes
2020-06-30 14:56:30 +02:00
Silvin Lubecki 541f050e1e
Merge pull request #2608 from thaJeztah/19.03_backport_vendor_bumps
[19.03 backport] minor vendor bumps
2020-06-30 14:55:50 +02:00
Sebastiaan van Stijn ac7723056a
docs: fix example output for docker plugin ls
The output format was changed to combine tag and name in a single
column, but this change was never reflected in the docs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c253918eaf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-30 14:45:35 +02:00
Simon Heimberg 9c9ff4369d
list state `ready` for filtering in stack_ps.md
Signed-off-by: SimonHeimberg <simon.heimberg@heimberg-ea.ch>
(cherry picked from commit 6a20e87ae8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4840a8dfbe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-30 14:45:22 +02:00
Sebastiaan van Stijn e3b981c18d
vendor konsorten/go-windows-terminal-sequences v1.0.3
full diff: https://github.com/konsorten/go-windows-terminal-sequences/compare/v1.0.2...v1.0.3

Fixes a panic when using logrus on Go 1.14

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4f65b65e81)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-30 14:32:24 +02:00
Sebastiaan van Stijn ec276f3a68
vendor: mitchellh/mapstructure v1.0.0
we were only one commit behind v1.0.0, so updating to that
version; we can do a follow-up to update to the latest minor
release (v1.3.0)

full diff: f15292f7a6...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit cf543e1308)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-30 14:28:54 +02:00
Sebastiaan van Stijn c9125cc39b
vendor: beorn7/perks v1.0.1
full diff: e7f67b54ab...v1.0.1

adds go module support

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 66dd9f29fa)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-30 14:24:26 +02:00
Tibor Vass 0ed913b885
Merge pull request #2592 from thaJeztah/19.03_backport_logout_config_out_of_sync2
[19.03 backport] Don't filter out registries to logout from with config file contents
2020-06-17 10:27:03 -07:00
Silvin Lubecki ab45dc8fdc
Merge pull request #2591 from thaJeztah/19.03_backport_docs_fixes2
[19.03 backport] assorted docs fixes
2020-06-17 17:36:01 +02:00
Simon Ferquel 5a12f90b4c
Don't filter out registries to logout from with config file contents
Previously, if a registry AuthInfo was not present in the CLI config file, docker logout could not be used
to ask the credential helper to forget about it. It causes problem for people working with
multiple alternative config files, and it causes problems for cases like Docker Desktop w/ WSL 2, as
it uses the same win32 credential helper as the Windows CLI, but a different config file, leading to
bugs where I cannot logout from a registry from wsl2 if I logged in from Windows and vice-versa.

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
(cherry picked from commit 6248f2fb6f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-17 17:32:39 +02:00
Sargun Dhillon 521a636a86
Add MOBY_DISABLE_PIGZ to dockerd environment variable docs
This reflects a Moby change to add documentation around
disabling a new feature -- to use pgzip to decompress
layers, rather than the built-in go gzip.

Signed-off-by: Sargun Dhillon <sargun@sargun.me>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e1148e2c70)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-17 16:50:48 +02:00
Sargun Dhillon 8b8ec04cd6
Split up environment variable documentation between cli and dockerd
This creates a new section of environment variables in the CLI docs
which documents environment variables that can both be used on dockerd
and on docker cli.

In addition, it moves some of the environment variable documentation
from the docker cli documentation to the dockerd documentation, as
these environment variables are dockerd-specific.

Signed-off-by: Sargun Dhillon <sargun@sargun.me>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ad301e7410)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-17 16:50:38 +02:00
dito 4e7c875e3b
Fix broken link
Signed-off-by: Daisuke Ito <itodaisuke00@gmail.com>
(cherry picked from commit 0f7260d1c7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-17 16:50:24 +02:00
Silvin Lubecki 2e6ff15dac
Merge pull request #2557 from thaJeztah/19.03_backport_fix_plugin_api_link
[19.03 backport] docs/extend: fix broken link and some markdown touch-ups
2020-06-17 16:35:12 +02:00
Silvin Lubecki f56d1b3646
Merge pull request #2575 from thaJeztah/19.03_backport_bump_golang_1.13.12
[19.03 backport] Bump Golang 1.13.12
2020-06-17 16:33:29 +02:00
Silvin Lubecki 8e7ff60ee1
Merge pull request #2589 from thaJeztah/19.03_backport_bump_x_text
[19.03 backport] vendor: golang.org/x/text v0.3.3 (CVE-2020-14040)
2020-06-17 16:16:12 +02:00
Sebastiaan van Stijn 6cb678f16f
vendor: golang.org/x/text v0.3.3
full diff: https://github.com/golang/text/compare/v0.3.2...v0.3.3

includes a fix for [CVE-2020-14040][1]

[1]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14040

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 668aea3f13)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-17 13:31:37 +02:00
Sebastiaan van Stijn 4515c51870
vendor: golang.org/x/text v0.3.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e32fe12ae3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-17 13:30:29 +02:00
Sebastiaan van Stijn 43a4e09bb2
Merge pull request #2586 from thaJeztah/19.03_backport_context_dont_loose_additional_fields
[19.03 backport] Don't loose additional metadata fields
2020-06-17 12:20:55 +02:00
Simon Ferquel cfa1fd9acd
Don't loose additional metadata fields
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
(cherry picked from commit 2ab4b4d536)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-16 15:31:21 +02:00
Sebastiaan van Stijn 6051b36dbf
Merge pull request #2570 from thaJeztah/19.03_backport_hardcode_name_in_errors
[19.03 backport] Use consistent name for errors
2020-06-12 16:20:30 +02:00
Sebastiaan van Stijn 31d338dd3a
Bump Golang 1.13.12
go1.13.12 (released 2020/06/01) includes fixes to the runtime, and the go/types
and math/big packages. See the Go 1.13.12 milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.12+label%3ACherryPickApproved

full diff: https://github.com/golang/go/compare/go1.13.11...go1.13.12

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1cd69c41e6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-11 16:35:23 +02:00
Silvin Lubecki 9cc05b9cec
Merge pull request #2548 from thaJeztah/19.03_backport_fix_dockerd_api_link
[19.03 backport] docs: fix broken link in dockerd.md
2020-06-11 15:21:08 +02:00
Sebastiaan van Stijn 936d328da9
Use consistent name for errors
This prevents inconsistent errors when using a symlink, or when renaming
the binary;

Before this change;

    ln -s $(which docker) toto
    ./toto rune
    docker: 'rune' is not a docker command.

    ./toto run daslkjadslkjdaslkj
    Unable to find image 'adslkjadslakdsj:latest' locally
    ./toto: Error response from daemon: pull access denied for adslkjadslakdsj, repository does not exist or may require 'docker login': denied: requested access to the resource is denied.

After this change:

    ln -s $(which docker) toto
    ./toto rune
    docker: 'rune' is not a docker command.

    ./toto run daslkjadslkjdaslkj
    Unable to find image 'adslkjadslakdsj:latest' locally
    docker: Error response from daemon: pull access denied for adslkjadslakdsj, repository does not exist or may require 'docker login': denied: requested access to the resource is den>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a3af1f47da)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-09 17:02:33 +02:00
Brian Goff dd360c7c0d
Merge pull request #2558 from tiborvass/19.03-expenv-panic
[19.03] Fix bug with panic when DOCKER_CLI_EXPERIMENTAL environment variable is incorrect
2020-05-28 13:41:25 -07:00
Tibor Vass 92b54c256a
Merge pull request #2560 from tiborvass/19.03-sshfix
[19.03] ssh: avoid setting flags through hostname
2020-05-28 13:34:20 -07:00
Tonis Tiigi 2ee7981985 ssh: avoid setting flags through hostname
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit d30970e3b1)
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-05-28 20:18:03 +00:00
Daniil Nikolenko e90b6bcb62 Fix bug with panic when DOCKER_CLI_EXPERIMENTAL environment variable is incorrect
Signed-off-by: Daniil Nikolenko <qoo2p5@gmail.com>
(cherry picked from commit cb010db830)
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-05-28 19:21:44 +00:00
Sebastiaan van Stijn 97afb72954
docs/extend: fix broken link and some markdown touch-ups
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a968359e08)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-28 17:30:32 +02:00
Sebastiaan van Stijn c280cdfd66
docs: fix broken link in dockerd.md
The Engine API docs are not available in this GitHub repository,
so linking to the docs.docker.com website instead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 98a3d6a48a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-25 11:09:18 +02:00
Tibor Vass fd7874f16d
Merge pull request #2532 from thaJeztah/19.03_backport_bump_golang_1.13.11
[19.03 backport] Bump Golang 1.13.11
2020-05-20 10:43:45 -07:00
Tibor Vass a945f0e7e0
Merge pull request #2538 from silvin-lubecki/fix-version-old-engine-19-03
[19.03 backport] Fix version old engine 19 03
2020-05-20 10:35:44 -07:00
Silvin Lubecki 0f59532a1a Run e2e tests with different engine version on Jenkins
Rewrite Jenkinsfile to new declarative syntax without parallel as the e2e framework is not tailored for than (container name clash, port clash,...)

Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>

(cherry picked from commit 74919d0569)
2020-05-20 19:02:21 +02:00
Silvin Lubecki 95df3499bb Add a new Makefile variable to override DockerInDocker engine version we use to run e2e tests
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit 15d6565e49)
2020-05-20 18:58:28 +02:00
Silvin Lubecki 2d1476c6f0 Partially revert cf663b526a as it breaks the version negotiation with an older docker engine.
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit 54f766d240)
2020-05-20 18:57:39 +02:00