dilim/moby
1
0 Fork 0
mirror of https://github.com/moby/moby.git synced 2026-11-06 13:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,422 Commits 19 Branches 618 Tags
master
Commit Graph
77 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 89a3b918d8 daemon/cluster/executor/container: rename var that shadowed 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-07-29 15:27:41 +02:00
Sopho Merkviladze 898a7d799e daemon/cluster: only fail a task on a pull error if the image is missing 
A task whose image cannot be pulled is rejected outright when the registry
answers with an "unauthorized" error, even when the image is already present
on the node. A service created without registry credentials carries no auth in
its spec and cannot have its digest resolved, so its tasks always attempt an
unauthenticated pull; on nodes that already hold the image those tasks are
rejected instead of started.

Tolerating a failed pull when the image is available locally is long-standing
behaviour, described in the comment above the check, and what the executor did
for every pull error before a7cf7eac0a ("fix: propagate registry auth error in
swarm image pull").

Keep reporting the pull failure, as it is far more useful than the "No such
image" the container create would otherwise produce, but only when the image
really is unavailable. Whether a task can run should not depend on how the
registry error happened to be classified, and that classification is not
consistent: the same registry 401 surfaces as ErrUnauthenticated from the
graphdriver pull path, as ErrNotFound from the containerd image store (via
docker.ErrInvalidAuthorization), and as ErrUnknown when the failure happens
while fetching a token, since the error is then a *url.Error that
translatePullError does not classify. The check therefore only fires for some
combinations of image store and registry.

The test needs DOCKER_SERVICE_PREFER_OFFLINE_IMAGE=0 on the daemon under test:
internal/testutil/daemon sets it to 1, which makes the executor skip the pull
altogether.

Signed-off-by: Sopho Merkviladze <smerkviladze@mirantis.com>
 2026-07-28 00:52:25 +02:00
Md_Mushfiqur Rahim a7cf7eac0a fix: propagate registry auth error in swarm image pull 
When a worker pull fails with unauthorized, the error was being
swallowed and replaced with misleading 'No such image' message.
Fix error propagation so the actual cause is reported.

Signed-off-by: Md_Mushfiqur Rahim <20mahin20201@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2026-06-12 15:37:21 +02:00
Austin Vazquez c646091d57 api: move container port type to network package 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-10-03 17:30:42 -05:00
Austin VazquezSebastiaan van StijnCory Snider
 		cb3abacc52 api/types/container: add network port and port range types 
Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Co-authored-by: Cory Snider <csnider@mirantis.com>
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
 2025-10-02 13:59:34 -05:00
Derek McGowan f74e5d48b3 Create github.com/moby/moby/v2 module 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-07-31 10:13:29 -07:00
Sebastiaan van Stijn d58dc493fe replace direct uses of nat types for api/types/container aliases 
Follow-up to 494677f93f, which added
the aliases, but did not yet replace our own use of the nat types.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-07-31 02:57:39 +02:00
Derek McGowan afd6487b2e Create github.com/moby/moby/api module 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-07-21 09:30:05 -07:00
Derek McGowan 7a720df61f Move libnetwork to daemon/libnetwork 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2025-07-14 09:25:23 -07:00
Matthieu MOREL 6d737371b8 fix comparison rule from errorlint 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2025-06-13 08:26:56 +00:00
Sebastiaan van Stijn 986ec3f877 daemon/cluster: remove // import comments 
These comments were added to enforce using the correct import path for
our packages ("github.com/docker/docker", not "github.com/moby/moby").
However, when working in go module mode (not GOPATH / vendor), they have
no effect, so their impact is limited.

Remove these imports in preparation of migrating our code to become an
actual go module.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-30 15:59:11 +02:00
Matthieu MOREL 55da8ea276 daemon: replace uses of errdefs package 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2025-05-28 05:38:39 +00:00
Sebastiaan van Stijn e477df3b31 daemon/cluster/executor: use container.ContainerState consts 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-13 15:03:41 +02:00
Matthieu MOREL e2e7f9964f fix(QF1003): Convert if/else-if chain to tagged switch 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-01 14:16:45 +02:00
Matthieu MOREL b0711d5fe9 fix(QF1001): Apply De Morgan’s law 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-01 14:16:44 +02:00
Sebastiaan van Stijn d9cf097402 daemon/cluster/executor/container: make switches exhaustive (exhaustive) 
Adding a `default` statement so that disabling the "default-signifies-exhaustive"
linter option will  make it show up.

    daemon/cluster/executor/container/adapter.go:351:3: missing cases in switch of type api.Mount_MountType: api.MountTypeVolume, api.MountTypeTmpfs, api.MountTypeNamedPipe, api.MountTypeCluster (exhaustive)
            switch mount.Type {
            ^
    daemon/cluster/executor/container/adapter.go:540:4: missing cases in switch of type api.LogStream: api.LogStreamUnknown (exhaustive)
                switch stream {
                ^
    daemon/cluster/executor/container/container.go:715:3: missing cases in switch of type api.Privileges_SeccompOpts_SeccompMode: api.Privileges_SeccompOpts_DEFAULT (exhaustive)
            switch seccomp.Mode {
            ^
    daemon/cluster/executor/container/controller.go:257:4: missing cases in switch of type events.Action: events.ActionCreate, events.ActionStart, events.ActionRestart, events.ActionStop, events.ActionCheckpoint, events.ActionPause, events.ActionUnPause, events.ActionAttach, events.ActionDetach, events.ActionResize, events.ActionUpdate, events.ActionRename, events.ActionKill, events.ActionOOM, events.ActionRemove, events.ActionCommit, events.ActionTop, events.ActionCopy, events.ActionArchivePath, events.ActionExtractToDir, events.ActionExport, events.ActionImport, events.ActionSave, events.ActionLoad, events.ActionTag, events.ActionUnTag, events.ActionPush, events.ActionPull, events.ActionPrune, events.ActionDelete, events.ActionEnable, events.ActionDisable, events.ActionConnect, events.ActionDisconnect, events.ActionReload, events.ActionMount, events.ActionUnmount, events.ActionExecCreate, events.ActionExecStart, events.ActionExecDie, events.ActionExecDetach, events.ActionHealthStatus, events.ActionHealthStatusRunning (exhaustive)
                switch event.Action {
                ^
    daemon/cluster/executor/container/controller.go:480:4: missing cases in switch of type events.Action: events.ActionCreate, events.ActionStart, events.ActionRestart, events.ActionStop, events.ActionCheckpoint, events.ActionPause, events.ActionUnPause, events.ActionAttach, events.ActionDetach, events.ActionResize, events.ActionUpdate, events.ActionRename, events.ActionKill, events.ActionDie, events.ActionOOM, events.ActionDestroy, events.ActionRemove, events.ActionCommit, events.ActionTop, events.ActionCopy, events.ActionArchivePath, events.ActionExtractToDir, events.ActionExport, events.ActionImport, events.ActionSave, events.ActionLoad, events.ActionTag, events.ActionUnTag, events.ActionPush, events.ActionPull, events.ActionPrune, events.ActionDelete, events.ActionEnable, events.ActionDisable, events.ActionConnect, events.ActionDisconnect, events.ActionReload, events.ActionMount, events.ActionUnmount, events.ActionExecCreate, events.ActionExecStart, events.ActionExecDie, events.ActionExecDetach, events.ActionHealthStatus, events.ActionHealthStatusRunning, events.ActionHealthStatusHealthy, events.ActionHealthStatusUnhealthy (exhaustive)
                switch event.Action {
                ^
    daemon/cluster/executor/container/controller.go:723:4: missing cases in switch of type events.Action: events.ActionCreate, events.ActionStart, events.ActionRestart, events.ActionStop, events.ActionCheckpoint, events.ActionPause, events.ActionUnPause, events.ActionAttach, events.ActionDetach, events.ActionResize, events.ActionUpdate, events.ActionRename, events.ActionKill, events.ActionDie, events.ActionOOM, events.ActionDestroy, events.ActionRemove, events.ActionCommit, events.ActionTop, events.ActionCopy, events.ActionArchivePath, events.ActionExtractToDir, events.ActionExport, events.ActionImport, events.ActionSave, events.ActionLoad, events.ActionTag, events.ActionUnTag, events.ActionPush, events.ActionPull, events.ActionPrune, events.ActionDelete, events.ActionEnable, events.ActionDisable, events.ActionConnect, events.ActionDisconnect, events.ActionReload, events.ActionMount, events.ActionUnmount, events.ActionExecCreate, events.ActionExecStart, events.ActionExecDie, events.ActionExecDetach, events.ActionHealthStatus, events.ActionHealthStatusRunning, events.ActionHealthStatusHealthy (exhaustive)
                switch event.Action {
                ^

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-02-09 13:22:52 +01:00
Sebastiaan van Stijn b96b14d078 cluster/executor/container: exitError: implement go1.13 unwrapper 
This error implemented the Causer interface, but did not implement
the go1.13 unwrapper, which could prevent errors from being matched.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-02-04 17:47:10 +01:00
Sebastiaan van Stijn 1abc8f6158 api/types: move container-inspect types to api/types/container 
This moves the `ContainerJSONBase`, `ContainerJSON` and `ContainerNode`
types to the api/types/container package and deprecates the old location.

- `ContainerJSONBase` was renamed to `InspectBase`
- `ContainerJSON` was rnamed to `InspectResponse`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-07-02 12:50:24 +02:00
Sebastiaan van Stijn 01efb9a5ab daemon/cluster/executor/container: fix error-handling 
While working on this file, I noticed the `isContainerCreateNameConflict`,
`isUnknownContainer`, and `isStoppedContainer` utilities, which are used
to perform error-type detection through string-matching.

These utilities were added in 534a90a993,
as part of the initial implementation of the Swarm executor in Docker.
At that time, the Docker API client did not return typed errors, and
various part of the code depended on string matching, which is brittle,
and it looks like `isContainerCreateNameConflict` at least is already
broken since c9d0a77657, which changed
the error-message.

Starting with ebcb7d6b40, we use typed
errors through the errdefs package, so we can replace these utilities:

The `isUnknownContainer` utility is replace by `errdefs.IsNotFound`,
which is returned if the object is not found. Interestingly, this utility
was checking for containers only (`No such container`), but was also
used for an `removeNetworks` call. Tracking back history of that use to
verify if it was _intentionally_ checking for a "container not found"
error;

- This check added in the initial implementation 534a90a993
- Moved from `controller.Remove` to `container.Shutdown` to make sure the
  sandbox was removed in 680d0ba4ab
- And finally touched again in 70fa7b6a3f,
  which was a follow-up to the previous one, and fixed the conditions
  to prevent returning early before the network was removed.

None of those patches mention that these errors are related to containers,
and checking the codepath that's executed, we can only expect a
`libmetwork.ErrNoSuchNetwork` to be returned, so this looks to have been
a bug.

The `isStoppedContainer` utility is replaced by `errdefs.IsNotModified`,
which is the error (status) returned in situations where the container
is already stopped; https://github.com/moby/moby/blob/caf502a0bc44c19b4e1dde50428de07ff756a8d3/daemon/stop.go#L30-L35
This is the only

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-06-17 21:14:47 +02:00
Sebastiaan van Stijn 0f871f8cb7 api/types/events: define "Action" type and consts 
Define consts for the Actions we use for events, instead of "ad-hoc" strings.
Having these consts makes it easier to find where specific events are triggered,
makes the events less error-prone, and allows documenting each Action (if needed).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-08-29 00:38:08 +02:00
Sebastiaan van Stijn c545473920 daemon/cluster: use strings.Cut() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-21 11:08:57 +01:00
Drew Erny 240a9fcb83 Add Swarm cluster volume supports 
Adds code to support Cluster Volumes in Swarm using CSI drivers.

Signed-off-by: Drew Erny <derny@mirantis.com>
 2022-05-13 00:55:44 +02:00
Cory Snider 1c129103b4 Bump swarmkit to v2 
Signed-off-by: Cory Snider <csnider@mirantis.com>
 2022-04-21 17:33:07 -04:00
Brian Goff 4b981436fe Fixup libnetwork lint errors 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2021-06-01 23:48:32 +00:00
Brian Goff a0a473125b Fix libnetwork imports 
After moving libnetwork to this repo, we need to update all the import
paths for libnetwork to point to docker/docker/libnetwork instead of
docker/libnetwork.
This change implements that.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2021-06-01 21:51:23 +00:00
Sebastiaan van Stijn 07d60bc257 Replace errors.Cause() with errors.Is() / errors.As() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-29 00:28:41 +02:00
Kir Kolyshkin 7b0e0335bc Fix some inefassign warnings 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2019-09-18 12:57:29 +02:00
Ethan Mosbaugh 50c6a5fb07 Fix rate limiting for logger, increase refill rate 
Signed-off-by: Ethan Mosbaugh <ethan@replicated.com>
 2019-06-12 13:48:36 -07:00
Arko Dasgupta 70fa7b6a3f Network not deleted after stack is removed 
Make sure adapter.removeNetworks executes during task Remove
adapter.removeNetworks was being skipped for cases when
isUnknownContainer(err) was true after adapter.remove was executed

This fix eliminates the nil return case forcing the function
to continue executing unless there is a true error

Fixes https://github.com/moby/moby/issues/39225

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
 2019-05-23 12:37:17 -07:00
Arko Dasgupta 680d0ba4ab Remove a network during task SHUTDOWN instead of REMOVE to 
make sure the LB sandbox is removed when a service is updated
with a --network-rm option

Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
 2019-05-06 20:26:59 -07:00
Lihua Tang 8df0b2de54 Fix typos in comment 
Signed-off-by: Lihua Tang <lhtang@alauda.io>
 2018-09-07 13:17:42 +08:00
Drew Erny 3c81dc3103 Block task starting until node attachments are ready 
Blocks the execution of tasks during the Prepare phase until there
exists an IP address for every overlay network in use by the task. This
prevents a task from starting before the NetworkAttachment containing
the IP address has been sent down to the node.

Includes a basic test for the correct use case.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2018-08-20 15:28:15 -05:00
Brian Goff e4b6adc88e Extract volume interaction to a volumes service 
This cleans up some of the package API's used for interacting with
volumes, and simplifies management.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2018-05-25 14:21:07 -04:00
Kir Kolyshkin 7d62e40f7e Switch from x/net/context -> context 
Since Go 1.7, context is a standard package. Since Go 1.9, everything
that is provided by "x/net/context" is a couple of type aliases to
types in "context".

Many vendored packages still use x/net/context, so vendor entry remains
for now.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-04-23 13:52:44 -07:00
Daniel Nephin 0dab53ff3c Move all daemon image methods into imageService 
imageService provides the backend for the image API and handles the
imageStore, and referenceStore.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-26 16:48:29 -05:00
Akihiro Suda 8e435b8279 Support SCTP port mapping (bump up API to v1.37) 
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2018-02-20 11:15:36 +09:00
Daniel Nephin 4f0d95fa6e Add canonical import comment 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-05 16:51:57 -05:00
Flavio Crisciani 51cea0a53c Restore error type in FindNetwork 
The error type libnetwork.ErrNoSuchNetwork is used in the controller
to retry the network creation as a managed network though the manager.
The change of the type was breaking the logic causing the network to
not being created anymore so that no new container on that network
was able to be launched
Added unit test

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-11-29 11:22:57 -08:00
Yong Tang 2ee8ef864f Merge pull request #34686 from mion00/templating-node-hostname-support 
Add support for .Node.Hostname templating in swarm services
 2017-09-13 21:06:11 -07:00
Carlo Mion e2f09fa6dd Add support for .Node.Hostname templating in swarm services 
Signed-off-by: Carlo Mion <mion00@gmail.com>
 2017-09-02 10:06:16 +02:00
Daniel Nephin 2f5f0af3fd Add unconvert linter 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-24 15:08:31 -04:00
Aaron Lehmann b642b3f21f Avoid using a map for log attributes 
Having a map per log entry seemed heavier than necessary. These
attributes end up being sorted and serialized, so storing them in a map
doesn't add anything (there's no random access element). In SwarmKit,
they originate as a slice, so there's an unnecessary conversion to a map
and back.

This also fixes the sort comparator, which used to inefficiently split
the string on each comparison.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-07-18 19:01:20 -07:00
Vincent Demeester e56e78976e Merge pull request #33377 from yastij/33371-matchevent-filtering 
matching events using ID and name
 2017-07-10 16:11:14 +02:00
Yassine TIJANI be9aa09246 removing TODO, and explain why we can't filter by id on the matchevent method. 
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
 2017-07-07 23:32:37 +02:00
Josh Soref 39bcaee47b Spelling fixes 
* additional
* ambiguous
* anonymous
* anything
* application
* because
* before
* building
* capabilities
* circumstances
* commit
* committer
* compresses
* concatenated
* config
* container
* container's
* current
* definition
* delimiter
* disassociates
* discovery
* distributed
* doesnotexist
* downloads
* duplicates
* either
* enhancing
* enumerate
* escapable
* exactly
* expect
* expectations
* expected
* explicitly
* false
* filesystem
* following
* forbidden
* git with
* healthcheck
* ignore
* independent
* inheritance
* investigating
* irrelevant
* it
* logging
* looking
* membership
* mimic
* minimum
* modify
* mountpoint
* multiline
* notifier
* outputting
* outside
* overridden
* override
* parsable
* plugins
* precedence
* propagation
* provided
* provides
* registries
* repositories
* returning
* settings
* should
* signals
* someone
* something
* specifically
* successfully
* synchronize
* they've
* thinking
* uninitialized
* unintentionally
* unmarshaling
* unnamed
* unreferenced
* verify

Signed-off-by: Josh Soref <jsoref@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-03 13:13:09 -07:00
Josh Hawn cfdf84d5d0 Update Container Wait Backend 
This patch consolidates the two WaitStop and WaitWithContext methods
on the container.State type. Now there is a single method, Wait, which
takes a context and a bool specifying whether to wait for not just a
container exit but also removal.

The behavior has been changed slightly so that a wait call during a
Created state will not return immediately but instead wait for the
container to be started and then exited.

The interface has been changed to no longer block, but instead returns
a channel on which the caller can receive a *StateStatus value which
indicates the ExitCode or an error if there was one (like a context
timeout or state transition error).

These changes have been propagated through the rest of the deamon to
preserve all other existing behavior.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2017-05-16 15:09:14 -07:00
Drew Erny 68f21418ac Change log details encoding format and support details on service logs 
URL query encode log details, so that characters like spaces don't make
log parsing ambiguous. Add a helper function to parse these details to a
map, if needed

Add support for details on service logs

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2017-05-12 10:53:44 -07:00
Aaron Lehmann 8fd55cd064 Merge pull request #31142 from dongluochen/network_converge_delay 
add 2 seconds delay to allow gossip converge
 2017-05-11 16:50:44 -07:00
Aaron Lehmann 9e9fc7b57c Add config support to executor backend 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-11 10:08:21 -07:00
Drew Erny 80c3ec027d Fix an issue with service logs hanging 
Fixed an issue where service logs would hang if the container backing a
task was deleted by not waiting for containers to be ready if we're not
following logs.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2017-05-04 12:13:14 -07:00