Merge pkg/truncindex and pkg/symlink from moby/moby#53
Merge pkg/truncindex and pkg/symlink from moby/moby#53dims wants to merge 309 commits intomoby:masterfrom
Conversation
Update running_riak_service.md
This reverts commit 5a3d774e5651da772a065282a1fb1a31e19e911c. Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael) Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
…ies behavior on non-existant targets." This reverts commit 1c8d3106df0bd2aba304c7b3863949ca11c2b133. Conflicts: archive/archive_test.go Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael) Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: vieux)
Conflicts: VERSION integration-cli/docker_cli_build_test.go Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Merge release v1.1.1
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Updated docker logs timestamp to RFC3339 (carrying #5723)
Replaced selected docs references to ADD with COPY
Replace ADD with COPY in Dockerfile
…g conventions. Docker-DCO-1.1-Signed-off-by: Phil Jackson <underscorephil@gmail.com> (github: underscorephil)
pkg/truncindex: add unclejack to MAINTAINERS
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Fixes #6345 Thanks @larsks for outstanding investigation Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
"db" is the parent image, and "web" links to it as the child image. There was a typo in the document which reversed the relation.
namespaces are not well documented, and I had to jump around to other docs. replacing `foo/bar` hopefully makes what's going on here a bit more obvious. Docker-DCO-1.1-Signed-off-by: Tim Ruffles <timruffles@gmail.com> (github: timruffles)
user facing documentation changes in master atm
Fixed parent-child relationship description
pkg/units: Better to not use `error` as var name
[DOCS] replace foo/bar with concrete names
Add AUDIT_WRITE cap
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Fix incorrect path in ENTRYPOINT example
/var/lock/apache2 /var/run/apache2
Typo in dockervolumes.md line 141?
allow sigquit to display stacktrace in debug mode
archive: add unclejack to MAINTAINERS
Since commit e9b9e4ace294230c6b8eb has landed, there is a chance that container.RWLayer is nil (due to some half-removed container). Let's check the pointer before use to avoid any potential nil pointer dereferences, resulting in a daemon crash. Note that even without the abovementioned commit, it's better to perform an extra check (even it's totally redundant) rather than to have a possibility of a daemon crash. In other words, better be safe than sorry. [v2: add a test case for daemon.getInspectData] [v3: add a check for container.Dead and a special error for the case] Fixes: e9b9e4ace294230c6b8eb Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
c.RWLayer: check for nil before use
Fix string type for buildargs API definition
graphdriver: Fix RefCounter memory leak
Various code-cleanup
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Bump continuity
Update API version to v1 38
Update copyright years
...and use ugorji/go 1.1.1 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: John Howard <jhoward@microsoft.com> This also adds go.etcd.io/bbolt as boltdb/bolt is no longer maintained, and we need etcd-io/bbolt#122 which was merged in https://github.com/etcd-io/bbolt/releases/tag/v1.3.1-etcd.8 in order to fix moby/libnetwork#1950. Note that I can't entirely remove boltdb/bolt as it is still used by other components. Still need to work my way through them.... These include containerd/containerd (containerd/containerd#2634), docker/swarmkit; moby/buildkit. And probably more....
daemon/logger/journald: simplify readers field
Revendor libnetwork @ 36d3bed0e9
vendor: bump etcd to v3.3.9
fixes display text in Multiple IDs found with provided prefix
Add support for sysctl options in services
Entropy cannot be saved
aufs: retry umount on ebusy, ignore ENOENT in graphdriver.Mounted
pkg/symlink: don't depend on pkg/system and pkg/longpath
ci: update golangci-lint v1.23.8
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
|
Notes on how the git history was pruned and grafted: |
|
@thaJeztah i don't feel that i should not try to "fix" the DCO failure, so leaving it as-is. |
|
Oh, thanks! Erm (oh, feel bad commenting that, because I didn't come round to try, and you did all the work), I think the idea was to only merge Thanks for providing the steps you took though; let me give it a quick try to repeat with pkg/symlink only |
Agreed; we can't change history, so no need to fix-up. Looks like most of them are because of the old There's also some where it complains about e-mail addresses, wonder if it supports |
|
thanks @thaJeztah ! the new PR looks good! ( i had missed a couple of things like stripping out |
|
Thanks for starting the work; your steps helped me getting it done (without having to do a lot of Google-fu 😂) |
We need to remove the recursive dependency of containerd<->moby/moby, containerd uses 2 packages from moby/moby. So to break the recursion, we need to move those two packages into a "neutral" repo. per the discussion in containerd/containerd#4631, the idea was to preserve the git history of these two packages and merge them into this repository
cc @thaJeztah