012b77952e
stack: Change unexpected environment variable error
...
Make the error more specific by stating that it's caused by a specific
environment variable and not an environment as a whole.
Also don't escape the variable to make it more readable.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2023-03-09 16:56:34 +01:00
a47058bbd5
stack/loader: Ignore cmd.exe special env variables
...
On Windows, ignore all variables that start with "=" when building an
environment variables map for stack.
For MS-DOS compatibility cmd.exe can set some special environment
variables that start with a "=" characters, which breaks the general
assumption that the first encountered "=" separates a variable name from
variable value and causes trouble when parsing.
These variables don't seem to be documented anywhere, but they are
described by some third-party sources and confirmed empirically on my
Windows installation.
Useful sources:
https://devblogs.microsoft.com/oldnewthing/20100506-00/?p=14133
https://ss64.com/nt/syntax-variables.html
Known variables:
- `=ExitCode` stores the exit code returned by external command (in hex
format)
- `=ExitCodeAscii` - same as above, except the value is the ASCII
representation of the code (so exit code 65 (0x41) becomes 'A').
- `=::=::\` and friends - store drive specific working directory.
There is one env variable for each separate drive letter that was
accessed in the shell session and stores the working directory for that
specific drive.
The general format for these is:
`=<DRIVE_LETTER>:=<CWD>` (key=`=<DRIVE_LETTER>:`, value=`<CWD>`)
where <CWD> is a working directory for the drive that is assigned to
the letter <DRIVE_LETTER>
A couple of examples:
`=C:=C:\some\dir` (key: `=C:`, value: `C:\some\dir`)
`=D:=D:\some\other\dir` (key: `=C:`, value: `C:\some\dir`)
`=Z:=Z:\` (key: `=Z:`, value: `Z:\`)
`=::=::\` is the one that seems to be always set and I'm not exactly
sure what this one is for (what's drive `::`?). Others are set as
soon as you CD to a path on some drive. Considering that you start a
cmd.exe also has some working directory, there are 2 of these on start.
All these variables can be safely ignored because they can't be
deliberately set by the user, their meaning is only relevant to the
cmd.exe session and they're all are related to the MS-DOS/Batch feature
that are irrelevant for us.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2023-03-09 16:48:55 +01:00
881c353576
Merge pull request #4046 from vvoland/dangling-images-none
...
formatter: Consider empty RepoTags and RepoDigests as dangling
2023-03-01 00:43:43 +01:00
89687d5b3f
formatter: Consider empty RepoTags and RepoDigests as dangling
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2023-02-24 17:00:55 +01:00
b244ad61cc
Merge pull request #4050 from vvoland/test-fakecli-images-mock
...
test/cli: Use empty array as empty output of images/json
2023-02-24 16:06:58 +01:00
a1953e19b2
test/cli: Use empty array as empty output of images/json
...
Tests mocking the output of GET images/json with fakeClient used an
array with one empty element as an empty response.
Change it to just an empty array.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2023-02-24 15:05:32 +01:00
0b05d28815
Merge pull request #4042 from nicks/nicks/write-file
...
context: adjust the file write logic to avoid corrupt context meta.json files
2023-02-23 17:27:59 +01:00
f5ac664f8a
Merge pull request #4019 from neersighted/graphdriver_misleading
...
docs: drop dated comments about graphdrivers
2023-02-23 17:23:19 +01:00
e636747a14
docs: drop dated comments about graphdrivers
...
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com >
2023-02-22 18:36:39 -07:00
c2487c2997
context: avoid corrupt file writes
...
Write to a tempfile then move, so that if the
process dies mid-write it doesn't corrupt the store.
Also improve error messaging so that if a file does
get corrupted, the user has some hope of figuring
out which file is broken.
For background, see:
https://github.com/docker/for-win/issues/13180
https://github.com/docker/for-win/issues/12561
For a repro case, see:
https://github.com/nicks/contextstore-sandbox
Signed-off-by: Nick Santos <nick.santos@docker.com >
2023-02-21 10:37:56 -05:00
dfb36eaef8
Merge pull request #4031 from thaJeztah/carry_4027
...
changed the container name in docker stats page (carry 4027)
2023-02-15 11:51:06 +01:00
d2f726d5ad
changed the container name in docker stats page
...
Signed-off-by: Aslam Ahemad <aslamahemad@gmail.com >
2023-02-14 18:45:54 +01:00
c173316515
Merge pull request #4017 from crazy-max/fix-ci-events
...
ci: fix branch filter pattern
2023-02-09 19:53:57 +01:00
0f39598687
ci: fix branch filter pattern
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com >
2023-02-09 18:03:11 +01:00
24b4924410
Merge pull request #4011 from neersighted/new_curator
...
MAINTAINERS: add myself as curator
2023-02-08 00:25:46 +01:00
4254cd19b9
MAINTAINERS: add myself as curator
...
Also remove a duplicate entry for @thaJeztah.
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com >
2023-02-07 10:13:53 -07:00
f42e1ad1a7
Merge pull request #4002 from thaJeztah/update_engine
...
vendor: github.com/docker/docker v23.0.0
2023-02-06 14:44:38 +01:00
6872164e45
Merge pull request #3965 from scop/fix/bash-completion-nounset
...
contrib/completion: bash `nounset` mode fixes
2023-02-06 12:34:44 +01:00
7abb189120
Merge pull request #4001 from corhere/run-eisdir
...
cli/command/container: exit 126 on EISDIR error
2023-02-06 12:33:34 +01:00
a04dee2638
Merge pull request #3999 from akerouanton/fix/throttledevice-key
...
Fix bad ThrottleDevice path
2023-02-06 12:32:21 +01:00
bbebebaedf
vendor: github.com/docker/docker v23.0.0
...
- client: improve error messaging on crash
full diff: https://github.com/docker/docker/compare/v23.0.0-rc.3...v23.0.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-02-04 13:30:07 +01:00
5195db1ff5
vendor: github.com/containerd/containerd v1.6.16
...
no changes in vendored code
full diff: https://github.com/containerd/containerd/compare/v1.6.15...v1.6.16
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-02-04 13:28:11 +01:00
9b5ceb52b0
cli/command/container: exit 126 on EISDIR error
...
The error returned from "os/exec".Command when attempting to execute a
directory has been changed from syscall.EACCESS to syscall.EISDIR on
Go 1.20. 2b8f214094csnider@mirantis.com >
2023-02-03 17:55:43 -05:00
56051b84b0
Fix bad ThrottleDevice path
...
Fixes moby/moby#44904 .
Signed-off-by: Albin Kerouanton <albinker@gmail.com >
2023-02-03 11:39:51 +01:00
e92dd87c32
Merge pull request #3996 from laurazard/skip-broken-credentials
...
build / build (cross, ) (push) Has been cancelled
build / build (cross, glibc) (push) Has been cancelled
build / build (dynbinary-cross, ) (push) Has been cancelled
build / build (dynbinary-cross, glibc) (push) Has been cancelled
build / plugins (push) Has been cancelled
e2e / e2e (19.03-dind, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, experimental) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, non-experimental) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, connhelper-ssh) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, experimental) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, non-experimental) (push) Has been cancelled
test / ctn (push) Has been cancelled
test / host (macos-11) (push) Has been cancelled
validate / validate (lint) (push) Has been cancelled
validate / validate (shellcheck) (push) Has been cancelled
validate / validate (update-authors) (push) Has been cancelled
validate / validate (validate-vendor) (push) Has been cancelled
validate / validate-make (manpages) (push) Has been cancelled
validate / validate-make (yamldocs) (push) Has been cancelled
Fix issue where one bad credential helper causes no credentials to be returned
2023-01-31 17:45:07 +01:00
9e3d5d1528
Fix issue where one bad credential helper causes none to be returned
...
Instead, skip bad credential helpers (and warn the user about the error)
Signed-off-by: Laura Brehm <laurabrehm@hey.com >
2023-01-31 17:14:30 +01:00
3ae101f41e
Merge pull request #3991 from dvdksn/docs/refactor-docs-dir
...
docs: move doc generation scripts to subdir
2023-01-31 13:27:37 +01:00
3a118309b8
Merge pull request #3990 from jedevc/manifest-oci
...
Add OCI support to manifest subcommand
2023-01-31 13:24:39 +01:00
1e3622c50c
docs: move doc generation scripts to subdir
...
Signed-off-by: David Karlsson <david.karlsson@docker.com >
2023-01-31 06:33:23 +01:00
4a500f690f
Merge pull request #3986 from AkihiroSuda/docker-container-remove
...
rm: allow `docker container remove` as an alias
2023-01-30 10:56:34 +01:00
9b54d860cd
rm: allow docker container remove as an alias
...
Fix issue 3985
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp >
2023-01-29 08:46:08 +09:00
0288f7f724
Merge pull request #3992 from neersighted/mke_ca_note
...
docs: add note about MKE CA rotation, which is potentially dangerous
2023-01-27 20:57:34 +01:00
00070e6e23
docs: add note about MKE CA rotation, which is potentially dangerous
...
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com >
2023-01-27 08:19:27 -07:00
67b9617898
manifest: save raw manifest content on download
...
This prevents us needing to attempt to reconstruct the exact indentation
registry side, which is not canonical - so may differ.
Signed-off-by: Justin Chadwell <me@jedevc.com >
2023-01-27 13:56:17 +00:00
285e137aa4
manifest: explicitly error if whitespace reconstruction has failed
...
This behavior should not break any more use cases than before.
Previously, if the mismatch occured, we would actually push a manifest
that we then never referred to in the manifest list! If this was done in
a new repository, the command would fail with an obscure error from the
registry - the content wouldn't exist with the descriptor we expect it
to.
Signed-off-by: Justin Chadwell <me@jedevc.com >
2023-01-27 13:51:57 +00:00
070825bc74
manifest: add support for oci image types
...
Signed-off-by: Justin Chadwell <me@jedevc.com >
2023-01-27 13:51:57 +00:00
645395cc77
Merge pull request #3987 from craig-osterhout/fix-exec-doc-typo
...
Fix typo in reference doc for docker exec
2023-01-24 08:41:29 +01:00
551c4e9ab9
Fix typo in reference doc for docker
...
Signed-off-by: Craig Osterhou <craig.osterhout@docker.com >
Signed-off-by: craig-osterhout <craig.osterhout@docker.com >
2023-01-23 14:05:21 -08:00
5f9c58ffa0
Merge pull request #3984 from thaJeztah/engine_23.0.0-rc.3
...
vendor: github.com/docker/docker v23.0.0-rc.3
2023-01-23 13:38:32 +01:00
8672540f8c
vendor: github.com/docker/docker v23.0.0-rc.3
...
full diff: https://github.com/docker/docker/compare/v23.0.0-rc.2...v23.0.0-rc.3
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:59:16 +01:00
c4fff9da13
vendor: github.com/moby/swarmkit/v2 v2.0.0-20230119195359-904c221ac281
...
full diff: 0da442b278...904c221ac2github@gone.nl >
2023-01-23 11:59:16 +01:00
526e5e7c95
vendor: golang.org/x/net v0.5.0
...
full diff: https://github.com/golang/net/compare/v0.4.0...v0.5.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:59:15 +01:00
d7f21ea9c8
vendor: golang.org/x/term v0.4.0
...
full diff: https://github.com/golang/term/compare/v0.3.0...v0.4.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:59:01 +01:00
ae43eb0e04
vendor: golang.org/x/text v0.6.0
...
no changes in vendored code
full diff: https://github.com/golang/text/compare/v0.5.0...v0.6.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:48:03 +01:00
caf8b152c6
vendor: golang.org/x/sys v0.4.0
...
full diff: https://github.com/golang/sys/compare/v0.3.0...v0.4.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2023-01-23 11:45:55 +01:00
e1152b2418
Merge pull request #3977 from alirostami01/master
...
build / build (cross, ) (push) Has been cancelled
build / build (cross, glibc) (push) Has been cancelled
build / build (dynbinary-cross, ) (push) Has been cancelled
build / build (dynbinary-cross, glibc) (push) Has been cancelled
build / plugins (push) Has been cancelled
e2e / e2e (19.03-dind, non-experimental) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, connhelper-ssh) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, experimental) (push) Has been cancelled
e2e / e2e (alpine, stable-dind, non-experimental) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, connhelper-ssh) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, experimental) (push) Has been cancelled
e2e / e2e (bullseye, stable-dind, non-experimental) (push) Has been cancelled
test / ctn (push) Has been cancelled
test / host (macos-11) (push) Has been cancelled
validate / validate (lint) (push) Has been cancelled
validate / validate (shellcheck) (push) Has been cancelled
validate / validate (update-authors) (push) Has been cancelled
validate / validate (validate-vendor) (push) Has been cancelled
validate / validate-make (manpages) (push) Has been cancelled
validate / validate-make (yamldocs) (push) Has been cancelled
Fix section docker ps --size
2023-01-18 16:46:09 +01:00
be30cb370e
Fix section docker ps --size
...
Remove the extra item "Size"
Signed-off-by: Ali Rostami <rostami.ali@gmail.com >
2023-01-18 13:17:35 +03:30
f7c322edba
Merge pull request #1900 from yuchengwu/8831-doc-user-restrict
...
note `--user` args usage restriction
2023-01-17 23:03:07 +01:00
5d04b1c49e
note --user args usage restriction
...
Signed-off-by: Yucheng Wu <wyc123wyc@gmail.com >
2023-01-17 22:45:23 +01:00
8627a6df16
Merge pull request #3971 from thaJeztah/sync_cobra_streams
...
cli: pass dockerCLI's in/out/err to cobra cmds
2023-01-17 17:57:03 +01:00
