Commit Graph

6631 Commits

Author SHA1 Message Date
Silvin Lubecki 7c0824cf3f
Merge pull request #2776 from thaJeztah/19.03_backport_deprecate_experimental_options
[19.03 backport] Deprecate configuration options for experimental CLI features
2020-10-02 18:02:28 +02:00
Sebastiaan van Stijn 20bc15f618
docs/deprecated: remove minor versions
Some deprecations are ammended during a major (YY.MM) release, to
inform users as early as possible about deprecations. Removing the
minor version from this overview clarifies that features are
marked deprecated during which major release's lifecycle.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit de8b696ed6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-02 17:14:53 +02:00
Sebastiaan van Stijn 3172219932
docs: deprecate CLI options for experimental CLI features
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 48822564b6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-02 17:09:55 +02:00
Sebastiaan van Stijn f132c8ad4a
docs: add /go/experimental/ vanity URL
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c2225ad126)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-02 17:07:44 +02:00
Tibor Vass 11b255cb7d
Merge pull request #2758 from thaJeztah/19.03_backport_update_security_link
[19.03 backport] docs: update URL for security landing page
2020-09-29 16:37:05 -07:00
Tibor Vass d3fcef0ffa
Merge pull request #2760 from thaJeztah/19.03_backport_fix_yaml_gen
[19.03 backport] docs: fix generated YAML due to trailing whitespace
2020-09-29 14:36:08 -07:00
Sebastiaan van Stijn df5ca0c950
docs: fix generated YAML due to trailing whitespace
If a file contains trailing whitespace, the YAML generator uses a
compact format, which is hard to read.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2484a30534)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-29 22:02:11 +02:00
Sebastiaan van Stijn 5057d34272
docs: update URL for security landing page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 54bbd782bf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-29 21:22:13 +02:00
Silvin Lubecki b53d702737
Merge pull request #2749 from thaJeztah/19.03_backport_fix_logs_example
[19.03 backport] docs: fix "docker logs" example missing container name
2020-09-29 10:21:47 +02:00
Silvin Lubecki 4620b42c3b
Merge pull request #2750 from thaJeztah/19.03_backport_rewrite_build_env
[19.03 backport] builder: rephrase ENV section, remove examples for ENV key value without '='
2020-09-29 10:20:43 +02:00
Sebastiaan van Stijn 278f30b82b
Add test-case for env with, and without =
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0eb3cfd261)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-28 14:16:03 +02:00
Sebastiaan van Stijn f526bcdb53
builder: add note about alternative syntax
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a4a3d2f94d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-28 14:16:00 +02:00
Sebastiaan van Stijn 10973d6ddf
builder: rephrase ENV section, remove examples for ENV key value without '='
The `ENV key value` form can be ambiguous, for example, the following defines
a single env-variable (`ONE`) with value `"TWO= THREE=world"`:

    ENV ONE TWO= THREE=world

While we cannot deprecate/remove that syntax (as it would break existing
Dockerfiles), we should reduce exposure of the format in our examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0a0037c6fd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-28 14:15:48 +02:00
Sebastiaan van Stijn 8c8fb03f15
docs: fix "docker logs" example missing container name
Thanks to rvsasseen for spotting this, and Maximillian Xavier
for the initial pull request.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bcb2a4c925)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-28 14:03:21 +02:00
Silvin Lubecki c80dda68d8
Merge pull request #2725 from thaJeztah/19.03_backport_update_caps_docs_and_completion
[19.03 backport] Update documentation on capabilities, and add missing CAP_AUDIT_READ
2020-09-18 11:58:03 +02:00
Sebastiaan van Stijn c9a03ab5f4
Bash-completion: add CAP_AUDIT_READ
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5b035964c4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 01:33:37 +02:00
Sebastiaan van Stijn ffa0e1d36e
docs: document CAP_AUDIT_READ
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 884a5ffbdf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 01:33:35 +02:00
Sebastiaan van Stijn 3d74f7ab48
docs: document optional "CAP_" prefix for capabilities
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4e58c29513)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 01:33:33 +02:00
Sebastiaan van Stijn 0a207d5095
docs: sort list of capabilities alphabetically
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5bbdcd1c9d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 01:33:31 +02:00
Sebastiaan van Stijn 9aa3848b06
Merge pull request #2724 from thaJeztah/19.03_backport_cap_completion
[19.03 backport] Complete capabilites with and without "CAP_" prefix.
2020-09-18 01:31:46 +02:00
Harald Albers 75411a2233
Complete capabilites with and without "CAP_" prefix.
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 015cb98846)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 15:53:03 +02:00
Tibor Vass cd8016b6bc
Merge pull request #2674 from thaJeztah/19.03_backport_bump_golang_1.13.15
[19.03 backport] Bump Golang 1.13.15
2020-09-15 16:02:04 -07:00
Silvin Lubecki cc30457076
Merge pull request #2720 from thaJeztah/19.03_remove_engine_alias
[19.03] vendor: stop using docker/engine fork for vendoring
2020-09-15 15:03:36 +02:00
Silvin Lubecki 96b16f2540
Merge pull request #2719 from thaJeztah/19.03_update_buildkit
[19.03] vendor: buildkit v0.6.4-32-gdf89d4dc
2020-09-15 15:02:47 +02:00
Sebastiaan van Stijn 896eb7123a
[19.03] vendor: stop using docker/engine fork for vendoring
Release branches and tags are published on the upstream repository
again, so no need to use the docker/engine repository anymore.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-15 11:44:50 +02:00
Sebastiaan van Stijn aebe8b0660
[19.03] vendor: buildkit v0.6.4-32-gdf89d4dc
full diff: ae10b292fe...v0.6.4-32-gdf89d4dc

- progressui: fix panic on terminals with zero height

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-15 11:35:09 +02:00
Sebastiaan van Stijn d6b05747dd
[19.03] vendor: tonistiigi/fsutil v0.0.0-20191018213012-0f039a052ca1
full diff: 3d2716dd0a...0f039a052c

- receive: use filter on receive diff
    - prevents incremental transfers with userns because the metadata
      on disk is always different than the one being transferred.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-15 11:35:06 +02:00
Silvin Lubecki 675a209afc
Merge pull request #2667 from thaJeztah/19.03_backport_remove_from_index
[19.03 backport] documentation updates
2020-09-14 14:56:16 +02:00
Silvin Lubecki 1fbcf9c7b6
Merge pull request #2717 from thaJeztah/19.03_backport_update_git_remote_description
[19.03 backport] docs/build: add note about git subdirectories with BuildKit
2020-09-14 14:43:16 +02:00
Sebastiaan van Stijn 9a65c1c861
docs/build: add note about git subdirectories with BuildKit
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b4db7e38bc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-14 11:39:08 +02:00
Tibor Vass bcb1c8486b
Merge pull request #2695 from thaJeztah/19.03_backport_fix_vbomml_util
[19.03 backport] Replace vbom.ml/util with fvbommel/sortorder
2020-08-28 16:25:36 +02:00
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
Sebastiaan van Stijn 36cdb166dc
Bump Golang 1.13.15
full diff: https://github.com/golang/go/compare/go1.13.14...go1.13.15

go1.13.15 (released 2020/08/06) includes security fixes to the encoding/binary
package. See the Go 1.13.15 milestone on the issue tracker for details.

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2315975272)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-10 17:26:33 +02:00
eyherabh 5c5486d910
Replaces ADD with COPY in the COPY section
Possibly a typo from reusing text from the ADD section.

Signed-off-by: Hugo Gabriel Eyherabide <hugogabriel.eyherabide@gmail.com>
(cherry picked from commit 86cbe28510)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 09:25:00 +02:00
Tonis Tiigi 9152bf265e
docs: remove docs for —-from=index
Naming stages is the preferred method for using
multi-stage builds.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 5dd9bd4c2c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-03 12:15:32 +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