Silvin Lubecki
6c6817f34e
Merge pull request #2744 from thaJeztah/fix_make_build
...
Fix make -f docker.Makefile without buildkit enabled
2020-09-24 14:06:51 +02:00
Sebastiaan van Stijn
7ecf320e1b
Fix make -f docker.Makefile without buildkit enabled
...
Commit 01cd748eb6
started using
Dockerfile features that are currently only supported with
buildkit enabled.
While we enabled buildkit in our Jenkinsfile, the makefile
did not do the same, causing some targets to fail if buildkit
was not enabled.
This patch updates the makefile to enable buildkit.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-24 13:01:42 +02:00
Tibor Vass
db411c35e6
Merge pull request #2743 from thaJeztah/deprecate_legacy_env_format
...
deprecate Dockerfile legacy 'ENV name value' syntax
2020-09-23 13:39:33 -07:00
Sebastiaan van Stijn
616e06874e
Merge pull request #2741 from thaJeztah/rewrite_build_env
...
builder: rephrase ENV section, remove examples for ENV key value without '='
2020-09-23 22:29:48 +02:00
Sebastiaan van Stijn
eec6710111
deprecate Dockerfile legacy 'ENV name value' syntax
...
The Dockerfile `ENV` instruction allows values to be set using either `ENV name=value`
or `ENV name value`. The latter (`ENV name value`) form can be ambiguous, for example,
the following defines a single env-variable (`ONE`) with value `"TWO= THREE=world"`,
but may have intended to be setting three env-vars:
ENV ONE TWO= THREE=world
This format also does not allow setting multiple environment-variables in a single
`ENV` line in the Dockerfile.
Use of the `ENV name value` syntax is discouraged, and may be removed in a future
release. Users are encouraged to update their Dockerfiles to use the `ENV name=value`
syntax, for example:
ENV ONE="" TWO="" THREE="world"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-23 20:50:00 +02:00
Sebastiaan van Stijn
0eb3cfd261
Add test-case for env with, and without =
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-23 20:33:48 +02:00
Sebastiaan van Stijn
a4a3d2f94d
builder: add note about alternative syntax
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-23 20:33:42 +02:00
Sebastiaan van Stijn
0a0037c6fd
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>
2020-09-23 13:21:20 +02:00
Sebastiaan van Stijn
b4eb079045
Fix buildkit flags not being hidden without buildkit enabled
...
These annotations use `nil` as value, which caused the flag-hiding functions
to ignore the annotations, and therefore not hiding the flags.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-22 14:47:55 +02:00
Sebastiaan van Stijn
e4b7edde09
Merge pull request #2732 from altmas5/fix-typos
...
Fix 2 typos
2020-09-22 14:12:16 +02:00
Silvin Lubecki
8822cabc6a
Merge pull request #2729 from thaJeztah/bump_engine
...
Updater docker/docker to latest master, containerd v1.4.1
2020-09-20 14:13:10 +02:00
Jorge Vallecillo
e7203bf81b
Fix 2 typos
...
Consecutive occurrences of 'the'
Signed-off-by: Jorge Vallecillo <jorgevallecilloc@gmail.com>
2020-09-18 09:26:39 -06:00
Sebastiaan van Stijn
33ecbbddaa
vendor: github.com/containerd/containerd v1.4.1
...
full diff: https://github.com/containerd/containerd/compare/v1.4.0...v1.4.1
Welcome to the v1.4.1 release of containerd!
The first patch release for `containerd` 1.4 includes a fix for v1 shims hanging
on exit and exec when the log pipe fills up along with other minor changes.
Notable Updates:
* Always consume shim logs to prevent logs in the shim from blocking
* Fix error deleting v2 bundle directory when removing rootfs returns `ErrNotExist`
* Fix metrics monitoring of v2 runtime tasks
* Fix incorrect stat for Windows containers
* Fix devmapper device deletion on rollback
* Update seccomp default profile
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 01:46:22 +02:00
Sebastiaan van Stijn
00b72960d7
vendor: docker/docker 7f7e4abb331a2973cfb3223710cc35a3e476b1b3
...
full diff: f50a40e889...7f7e4abb33
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-18 01:42:37 +02:00
Sebastiaan van Stijn
75598aa92a
Merge pull request #2728 from jennydaman/manifest-rm
...
Fix bash completion typo `docker manifest rm`
2020-09-18 01:35:00 +02:00
Jennings Zhang
bd8948761c
Fix typo
...
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
2020-09-17 15:33:46 -04:00
Sebastiaan van Stijn
b747821ace
Merge pull request #2449 from jennydaman/manifest-rm
...
`docker manifest rm` command to remove manifest list draft from local storage
2020-09-17 20:52:52 +02:00
Tõnis Tiigi
ee360d3998
Merge pull request #2726 from thaJeztah/add_new_caps
...
Add docs and bash-completion for new Linux capabilities
2020-09-17 11:45:43 -07:00
Sebastiaan van Stijn
6065dccc98
Add docs and bash-completion for new Linux capabilities
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 16:22:43 +02:00
Sebastiaan van Stijn
f19e31afe2
docs: add link to linux kernel source code for capabilities
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 16:22:41 +02:00
Sebastiaan van Stijn
72a357858c
docs: resize capabilities table
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 16:22:38 +02:00
Silvin Lubecki
3191903ca4
Merge pull request #2723 from thaJeztah/update_caps_docs_and_completion
...
Update documentation on capabilities, and add missing CAP_AUDIT_READ
2020-09-16 16:17:58 +02:00
Sebastiaan van Stijn
5b035964c4
Bash-completion: add CAP_AUDIT_READ
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 15:47:19 +02:00
Sebastiaan van Stijn
884a5ffbdf
docs: document CAP_AUDIT_READ
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 15:46:09 +02:00
Sebastiaan van Stijn
4e58c29513
docs: document optional "CAP_" prefix for capabilities
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 15:32:04 +02:00
Sebastiaan van Stijn
5bbdcd1c9d
docs: sort list of capabilities alphabetically
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-16 15:26:20 +02:00
Jennings Zhang
185d71262a
Subcommand `docker manifest rm`
...
Squashed commit of the following:
commit b9ef85e74833ba405f68cfc20989c69d64bac4e9
Author: Jennings Zhang <jenni_zh@protonmail.com>
Date: Mon Sep 14 21:39:57 2020 -0400
Fix bash completion
https://github.com/docker/cli/pull/2449#pullrequestreview-488110510
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
commit 8c46bd6e6ed151bb43865c8b1d79c00fd62e4345
Author: Jennings Zhang <jenni_zh@protonmail.com>
Date: Sun Sep 13 01:48:12 2020 -0400
Add tests for docker manifest rm
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
commit 7e3d9a9bc60e44d96953093fa0b1bc3397ca7813
Author: Jennings Zhang <jenni_zh@protonmail.com>
Date: Sun Sep 13 00:55:37 2020 -0400
docker manifest rm multiple args
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
commit 30466e28d28f6722053c5a232e99ddbae8222715
Author: Jennings Zhang <jenni_zh@protonmail.com>
Date: Sun Sep 13 00:01:20 2020 -0400
No need to search before Remove
https://github.com/docker/cli/pull/2449#discussion_r485544044
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
commit ccdc4ed0a620cf8c9ec6ecc6804d1a45f7c61be5
Author: Jennings Zhang <jenni_zh@protonmail.com>
Date: Sat Sep 12 23:42:41 2020 -0400
Completion should also handle --help
https://github.com/docker/cli/pull/2449#discussion_r443140909
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
commit ed260afa71a4f8feb6550f79692e47ad7430d786
Merge: 46c61d85e9 2955ece024
Author: Jennings Zhang <jenni_zh@protonmail.com>
Date: Sat Sep 12 23:31:54 2020 -0400
Merge branch 'master' into manifest-rm
commit 46c61d85e973cc9fdd28d42db9ecebe373e9b942
Author: Jennings Zhang <jenni_zh@protonmail.com>
Date: Fri Apr 17 21:53:33 2020 -0400
Remove extra space
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
commit 6d31d26c10e8d395ab08561cdb9b29829bb4bd91
Author: Jennings Zhang <jenni_zh@protonmail.com>
Date: Fri Apr 17 21:15:21 2020 -0400
Bash completion for `docker manifest rm`
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
commit 3c8c843deb2f751a5f51ee6fcaa75da2a4525d99
Author: Jennings Zhang <jenni_zh@protonmail.com>
Date: Fri Apr 17 21:05:50 2020 -0400
Frankenstein a `docker manifest rm` command
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
Signed-off-by: Jennings Zhang <jenni_zh@protonmail.com>
2020-09-15 16:26:47 -04:00
Silvin Lubecki
e0eba83bdd
Merge pull request #2714 from albers/completion-ulimits
...
Improve bash completion for ulimits
2020-09-14 14:02:55 +02:00
Silvin Lubecki
dbb2a52a74
Merge pull request #2716 from thaJeztah/update_git_remote_description
...
docs/build: add note about git subdirectories with BuildKit
2020-09-14 12:24:57 +02:00
Sebastiaan van Stijn
b4db7e38bc
docs/build: add note about git subdirectories with BuildKit
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-14 11:36:55 +02:00
Harald Albers
1e864920ac
Improve bash completion for ulimits
...
This adds bash completion for limits after
- docker service create --ulimit
- docker service update --ulimit-add
- docker service update --ulimit-rm
- docker container create --ulimit
- docker container run --ulimit
- docker build --ulimit
- dockerd --default-ulimit
Signed-off-by: Harald Albers <github@albersweb.de>
2020-09-12 16:04:24 +02:00
Silvin Lubecki
2955ece024
Merge pull request #2713 from thaJeztah/update_circleci
...
CircleCI: update to docker 19.03.12
2020-09-11 17:06:41 +02:00
Sebastiaan van Stijn
57326f5e6d
CircleCI: update to docker 19.03.12
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-11 16:44:02 +02:00
Tibor Vass
cec8723d8c
Merge pull request #2656 from thaJeztah/bump_buildkit
...
vendor: buildkit 4d1f260e8490ec438ab66e08bb105577aca0ce06
2020-09-10 17:43:42 -04:00
Tibor Vass
7836597b3d
Merge pull request #2712 from thaJeztah/carry_2660_ulimits
...
Add ulimits support to docker service and docker stack deploy (carry 2660)
2020-09-10 15:40:25 -04:00
Sebastiaan van Stijn
1778ffbb18
Merge pull request #2709 from thaJeztah/service_caps_reset
...
Service cap-add/cap-drop: add special "RESET" value
2020-09-10 15:22:41 +02:00
Albin Kerouanton
940907951b
Support ulimits in docker stack deploy
...
This is related to moby/moby 40639.
Signed-off-by: Albin Kerouanton <albin@akerouanton.name>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-10 14:59:02 +02:00
Albin Kerouanton
a9158bdc50
Add ulimits option to docker service create/update/inspect
...
This is related to moby/moby 40639.
Signed-off-by: Albin Kerouanton <albin@akerouanton.name>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-10 14:41:33 +02:00
Sebastiaan van Stijn
866e4b10a1
opts/UlimitOpt: sort lists by name
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-10 11:56:27 +02:00
Sebastiaan van Stijn
23660be600
Service cap-add/cap-drop: add special "RESET" value
...
This implements a special "RESET" value that can be used to reset the
list of capabilities to add/drop when updating a service.
Given the following service;
| CapDrop | CapAdd |
| -------------- | ------------- |
| CAP_SOME_CAP | |
When updating the service, and applying `--cap-drop RESET`, the "drop" list
is reset to its default:
| CapDrop | CapAdd |
| -------------- | ------------- |
| | |
When updating the service, and applying `--cap-drop RESET`, combined with
`--cap-add CAP_SOME_CAP` and `--cap-drop CAP_SOME_OTHER_CAP`:
| CapDrop | CapAdd |
| -------------- | ------------- |
| CAP_FOO_CAP | CAP_SOME_CAP |
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-10 11:14:38 +02:00
Sebastiaan van Stijn
7edc00d808
vendor: buildkit 4d1f260e8490ec438ab66e08bb105577aca0ce06
...
full diff: df35e9818d...4d1f260e84
- moby/buildkit#1551 session: track sessions with a group construct
- moby/buildkit#1534 secrets: allow providing secrets with env
- moby/buildkit#1533 git: support for token authentication
- moby/buildkit#1549 progressui: fix logs time formatting
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 15:19:02 +02:00
Silvin Lubecki
60abe967b5
Merge pull request #2711 from thaJeztah/bump_engine
...
vendor: bump docker/docker, docker/swarmkit, and dependencies
2020-09-09 15:08:53 +02:00
Sebastiaan van Stijn
ed339fa5c1
vendor: update prometheus deps to match docker/docker
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 14:57:00 +02:00
Sebastiaan van Stijn
338e83837b
vendor: github.com/golang/protobuf v1.3.5
...
full diff: https://github.com/golang/protobuf/compare/v1.3.3...v1.3.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 14:09:42 +02:00
Sebastiaan van Stijn
038cc46f88
vendor: github.com/containerd/cgroups 318312a373405e5e91134d8063d04d59768a1bff
...
full diff: 44306b6a1d...318312a373
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 14:08:01 +02:00
Sebastiaan van Stijn
9968ccafe8
vendor: github.com/containerd/containerd v1.4.0-rc.1
...
full diff: c80284d4b5
...v1.4.0-rc.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 14:07:58 +02:00
Sebastiaan van Stijn
5468092784
vendor: opencontainers/runc v1.0.0-rc92
...
full diff: https://github.com/opencontainers/runc/compare/v1.0.0-rc10...v1.0.0-rc92
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 14:07:56 +02:00
Sebastiaan van Stijn
dbe2f594ed
vendor: golang.org/x/sys ed371f2e16b4b305ee99df548828de367527b76b
...
full diff: 85ca7c5b95...ed371f2e16
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 14:07:54 +02:00
Sebastiaan van Stijn
e70e756053
vendor golang.org/x/net v0.0.0-20200707034311-ab3426394381
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 14:07:52 +02:00
Sebastiaan van Stijn
1c3a97b0ff
vendor golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-09-09 14:07:50 +02:00