7a14b6b3a3
context: Ensure import paths are valid
...
Signed-off-by: Chris Crone <christopher.crone@docker.com>
(cherry picked from commit 6f49197cab
2021-01-29 13:12:06 +00:00
da9ee7d883
Merge pull request #2870 from thaJeztah/19.03_backport_fix_yaml_formatting
...
[19.03 backport] docs: un-wrap line to prevent YAML docs from using "compact" formatting
2020-12-08 09:22:51 +01:00
a5c741eacf
docs: un-wrap line to prevent YAML docs from using "compact" formatting
...
Looks like the YAML conversion doesn't like lines starting with `[`, and
causing it to use the "compact" formatting in the generated YAML.
This patch un-wraps these lines to prevent this.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3455643194
2020-12-07 12:27:33 +01:00
fd3371eb7d
Merge pull request #2810 from thaJeztah/19.03_backport_docs_maintainer
...
[19.03 backport] Replace deprecated instruction
2020-10-24 09:44:17 +02:00
01fc5a1ec3
Replace deprecated instruction
...
MAINTAINER is deprecated, replacing with LABEL as recommended by
https://docs.docker.com/engine/reference/builder/#maintainer-deprecated
Signed-off-by: Charlotte Mach <charlotte.mach@fs.lmu.de>
(cherry picked from commit aa4cb24739
2020-10-24 01:13:34 +02:00
8363956559
Merge pull request #2797 from thaJeztah/19.03_backport_reversion
...
[19.03 backport] docs: update 20.03 -> 20.10 in deprecated.md
2020-10-16 22:49:04 +02:00
3b3e295c4b
docs: update 20.03 -> 20.10 in deprecated.md
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6c0a3dfbff
2020-10-16 02:23:14 +02:00
3ce6b9faea
Merge pull request #2781 from thaJeztah/19.03_backport_fix_links
...
[19.03 backport] docs: fix broken links in build reference
2020-10-07 11:37:09 +02:00
d1b44aa298
docs: fix broken links in build reference
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3fe574b7ef
2020-10-07 11:08:24 +02:00
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
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
2020-10-02 17:14:53 +02:00
3172219932
docs: deprecate CLI options for experimental CLI features
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 48822564b6
2020-10-02 17:09:55 +02:00
f132c8ad4a
docs: add /go/experimental/ vanity URL
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c2225ad126
2020-10-02 17:07:44 +02:00
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
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
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
2020-09-29 22:02:11 +02:00
5057d34272
docs: update URL for security landing page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 54bbd782bf
2020-09-29 21:22:13 +02:00
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
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
278f30b82b
Add test-case for env with, and without =
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0eb3cfd261
2020-09-28 14:16:03 +02:00
f526bcdb53
builder: add note about alternative syntax
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a4a3d2f94d
2020-09-28 14:16:00 +02:00
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
2020-09-28 14:15:48 +02:00
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
2020-09-28 14:03:21 +02:00
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
c9a03ab5f4
Bash-completion: add CAP_AUDIT_READ
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5b035964c4
2020-09-18 01:33:37 +02:00
ffa0e1d36e
docs: document CAP_AUDIT_READ
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 884a5ffbdf
2020-09-18 01:33:35 +02:00
3d74f7ab48
docs: document optional "CAP_" prefix for capabilities
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4e58c29513
2020-09-18 01:33:33 +02:00
0a207d5095
docs: sort list of capabilities alphabetically
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5bbdcd1c9d
2020-09-18 01:33:31 +02:00
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
75411a2233
Complete capabilites with and without "CAP_" prefix.
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 015cb98846
2020-09-16 15:53:03 +02:00
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
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
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
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
aebe8b0660
[19.03] vendor: buildkit v0.6.4-32-gdf89d4dc
...
full diff: ae10b292fe
2020-09-15 11:35:09 +02:00
d6b05747dd
[19.03] vendor: tonistiigi/fsutil v0.0.0-20191018213012-0f039a052ca1
...
full diff: 3d2716dd0a...0f039a052c
2020-09-15 11:35:06 +02:00
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
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
9a65c1c861
docs/build: add note about git subdirectories with BuildKit
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b4db7e38bc
2020-09-14 11:39:08 +02:00
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
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
2020-08-28 16:17:03 +02:00
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
2020-08-10 17:26:33 +02:00
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
2020-08-05 09:25:00 +02:00
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
2020-08-03 12:15:32 +02:00
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
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
2020-07-17 17:07:06 +02:00
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
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
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
2020-07-16 15:47:06 +02:00
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
Chris Crone
Silvin Lubecki
Sebastiaan van Stijn
Charlotte Mach
Sebastiaan van Stijn
Tibor Vass
Harald Albers
eyherabh
Tonis Tiigi