Merge pkg/truncindex and pkg/symlink from moby/moby by dims · Pull Request #53 · moby/sys

dims · 2020-10-29T02:27:47Z

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

Update running_riak_service.md

This reverts commit 5a3d774e5651da772a065282a1fb1a31e19e911c. Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael) Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (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 <[email protected]> (github: crosbymichael) Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: vieux)

Bump v1.1.1

Conflicts: VERSION integration-cli/docker_cli_build_test.go Docker-DCO-1.1-Signed-off-by: Victor Vieux <[email protected]> (github: vieux)

Merge release v1.1.1

Docker-DCO-1.1-Signed-off-by: Tibor Vass <[email protected]> (github: tiborvass)

Docker-DCO-1.1-Signed-off-by: James Turnbull <[email protected]> (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 <[email protected]> (github: underscorephil)

pkg/truncindex: add unclejack to MAINTAINERS

Docker-DCO-1.1-Signed-off-by: SvenDowideit <[email protected]> (github: SvenDowideit)

@larsks

Fixes #6345 Thanks @larsks for outstanding investigation Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <[email protected]> (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 <[email protected]> (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 <[email protected]> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: Victor Vieux <[email protected]> (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 <[email protected]>

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 <[email protected]>

Bump continuity

Update API version to v1 38

Update copyright years

...and use ugorji/go 1.1.1 Signed-off-by: Kir Kolyshkin <[email protected]>

Signed-off-by: John Howard <[email protected]> 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 <[email protected]>

dims · 2020-10-29T02:32:09Z

Notes on how the git history was pruned and grafted:

~/go/src/github.com/moby/moby> git checkout -b merging-some-branches
~/go/src/github.com/moby/moby> git filter-repo --path pkg/symlink --path pkg/truncindex
~/go/src/github.com/moby/moby> cd ../sys
~/go/src/github.com/moby/moby> git remote add patchy ../moby
~/go/src/github.com/moby/moby> git fetch patchy
~/go/src/github.com/moby/moby> git merge --allow-unrelated-histories --signoff -m "Merge pkg/(symlink|truncindex) from moby/moby into moby/sys" patchy/merging-some-branches

dims · 2020-10-29T02:33:07Z

@thaJeztah i don't feel that i should not try to "fix" the DCO failure, so leaving it as-is.

thaJeztah · 2020-10-29T08:17:19Z

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 pkg/symlink here, and for pkg/truncindex, just creating a copy in containerd would be ok (could of course keep history there as well if useful)

Thanks for providing the steps you took though; let me give it a quick try to repeat with pkg/symlink only

thaJeztah · 2020-10-29T08:30:23Z

i don't feel that i should not try to "fix" the DCO failure, so leaving it as-is.

Agreed; we can't change history, so no need to fix-up.

Looks like most of them are because of the old Docker-DCO.. that we used in the past, although the GitHub handle in the first one I picked looks odd (possibly because it was a cherry-pick / carry);

Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: vieux)

There's also some where it complains about e-mail addresses, wonder if it supports .mailmap (not worth the effort though)

dims · 2020-10-29T10:36:43Z

thanks @thaJeztah ! the new PR looks good! ( i had missed a couple of things like stripping out pkg/ and adding the new package to the Makefile etc. )

thaJeztah · 2020-10-29T11:16:46Z

Thanks for starting the work; your steps helped me getting it done (without having to do a lot of Google-fu 😂)

Sven Dowideit and others added 30 commits July 8, 2014 09:35

Merge pull request #6871 from prosto-chewey/patch-1

33bcc5a

Update running_riak_service.md

Revert "allow overwrite in untar"

129d90a

This reverts commit 5a3d774e5651da772a065282a1fb1a31e19e911c. Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: crosbymichael) Docker-DCO-1.1-Signed-off-by: Michael Crosby <[email protected]> (github: vieux)

Merge pull request #6915 from vieux/bump_v1.1.1

a69977f

Bump v1.1.1

Merge remote-tracking branch 'origin/release'

98906c7

Conflicts: VERSION integration-cli/docker_cli_build_test.go Docker-DCO-1.1-Signed-off-by: Victor Vieux <[email protected]> (github: vieux)

Merge pull request #6936 from vieux/merge_release_v1.1.1

c8222a2

Merge release v1.1.1

Replace ADD with COPY in Dockerfile

d032343

Docker-DCO-1.1-Signed-off-by: Tibor Vass <[email protected]> (github: tiborvass)

Replaced selected docs references to ADD with COPY

03b071e

Docker-DCO-1.1-Signed-off-by: James Turnbull <[email protected]> (github: jamtur01)

Merge pull request #6931 from tiborvass/merge-5723

4e16a78

Updated docker logs timestamp to RFC3339 (carrying #5723)

Merge pull request #6942 from jamtur01/addcopy

06ad5f0

Replaced selected docs references to ADD with COPY

Merge pull request #6941 from tiborvass/use-copy-in-docker-dockerfile

ae0e438

Replace ADD with COPY in Dockerfile

Updating to reflect changes in the SoftLayer portal and product namin…

e1a2730

…g conventions. Docker-DCO-1.1-Signed-off-by: Phil Jackson <[email protected]> (github: underscorephil)

Merge pull request #7167 from unclejack/maintainer_truncindex

6fb2ea3

pkg/truncindex: add unclejack to MAINTAINERS

user facing documentation changes in master atm

6971656

Docker-DCO-1.1-Signed-off-by: SvenDowideit <[email protected]> (github: SvenDowideit)

Add AUDIT_WRITE cap

58a8d8f

Fixes #6345 Thanks @larsks for outstanding investigation Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <[email protected]> (github: LK4D4)

Fixed parent-child relationship description

cc6888e

"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.

[DOCS] replace foo/bar with concrete names

27a6902

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 <[email protected]> (github: timruffles)

Merge pull request #7176 from SvenDowideit/auto-update-master-cli-docs

de81194

user facing documentation changes in master atm

Merge pull request #7180 from rhuss/patch-1

5fc5c2a

Fixed parent-child relationship description

Merge pull request #7164 from fcarriedo/not-error-as-var-name

87689fc

pkg/units: Better to not use `error` as var name

Merge pull request #7181 from timruffles/patch-3

d0e3778

[DOCS] replace foo/bar with concrete names

Merge pull request #7179 from LK4D4/add_cap_audit_write_#6345

7d88a68

Add AUDIT_WRITE cap

Added proposed Docker Community Guidelines

00dbd64

Docker-DCO-1.1-Signed-off-by: James Turnbull <[email protected]> (github: jamtur01)

allow sigquit to display stacktrace in debug mode

f0f3d02

Docker-DCO-1.1-Signed-off-by: Victor Vieux <[email protected]> (github: vieux)

Merge pull request #7185 from thaJeztah/patch-1

e745fec

Fix incorrect path in ENTRYPOINT example

Typo in dockervolumes.md line 141?

4accd1c

apache2 was looking for two other directories

aba7753

/var/lock/apache2 /var/run/apache2

Merge pull request #7234 from michielbdejong/patch-1

0bd5f41

Typo in dockervolumes.md line 141?

Merge pull request #7231 from vieux/allow_stack_trace

6ddeeb0

allow sigquit to display stacktrace in debug mode

Merge pull request #7166 from unclejack/maintainer_archive

e693231

archive: add unclejack to MAINTAINERS

kolyshkin and others added 21 commits February 9, 2018 11:24

Merge pull request #36242 from kolyshkin/rwlayer-nil-deref

46b0013

c.RWLayer: check for nil before use

Merge pull request #36246 from sirreal/fix/swagger-buildargs-type

f084535

Fix string type for buildargs API definition

Merge pull request #36256 from wcwxyz/fix-refcounter-memory-leak

d42aa95

graphdriver: Fix RefCounter memory leak

Merge pull request #37108 from thaJeztah/remove_unneeded_aliases

127d0ba

Various code-cleanup

Bump API version to v1.38

1ca381d

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Merge pull request #37133 from cpuguy83/bump_continuity

80d2f6b

Bump continuity

Merge pull request #37141 from thaJeztah/bump_api_v1_38

9aa77c9

Update API version to v1 38

Merge pull request #37829 from Vereas/Update-Copyright-Year-1

adbbb25

Update copyright years

vendor: bump etcd to v3.3.9

bd3c34e

...and use ugorji/go 1.1.1 Signed-off-by: Kir Kolyshkin <[email protected]>

Merge pull request #37819 from kolyshkin/journald-cleanup

c4916a0

daemon/logger/journald: simplify readers field

Merge pull request #37843 from Microsoft/jjh/boltdb

086ba8b

Revendor libnetwork @ 36d3bed0e9

Merge pull request #37805 from kolyshkin/bump-etcd

f7a4500

vendor: bump etcd to v3.3.9

Merge pull request #37904 from lifubang/idprefix

986b389

fixes display text in Multiple IDs found with provided prefix

Merge pull request #37701 from dperny/add-swarmkit-sysctl-support

80fbc32

Add support for sysctl options in services

Merge pull request #39336 from justincormack/entropy-cannot-be-saved

e8d9f2e

Entropy cannot be saved

Merge pull request #39270 from kolyshkin/moar-aufs-fixes

0525e2b

aufs: retry umount on ebusy, ignore ENOENT in graphdriver.Mounted

Merge pull request #40648 from thaJeztah/standalone_symlink

8c2f90b

pkg/symlink: don't depend on pkg/system and pkg/longpath

Merge pull request #40661 from thaJeztah/update_golangci_lint

d2ae310

ci: update golangci-lint v1.23.8

Merge pkg/(symlink|truncindex) from moby/moby into moby/sys

521cf7d

Signed-off-by: Davanum Srinivas <[email protected]>

dims mentioned this pull request Oct 29, 2020

Copy pkg/symlink and pkg/truncindex from moby/moby containerd/containerd#4631

Merged

thaJeztah mentioned this pull request Oct 29, 2020

Migrate github.com/docker/docker/pkg/symlink #54

Merged

dims closed this Oct 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Merge pkg/truncindex and pkg/symlink from moby/moby#53

Merge pkg/truncindex and pkg/symlink from moby/moby#53
dims wants to merge 309 commits intomoby:masterfrom
dims:merge-pkg-truncindex-and-symlink-from-moby/moby

dims commented Oct 29, 2020

Uh oh!

dims commented Oct 29, 2020

Uh oh!

dims commented Oct 29, 2020

Uh oh!

thaJeztah commented Oct 29, 2020

Uh oh!

thaJeztah commented Oct 29, 2020

Uh oh!

dims commented Oct 29, 2020

Uh oh!

thaJeztah commented Oct 29, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Comments

Conversation

dims commented Oct 29, 2020

Uh oh!

dims commented Oct 29, 2020

Uh oh!

dims commented Oct 29, 2020

Uh oh!

thaJeztah commented Oct 29, 2020

Uh oh!

thaJeztah commented Oct 29, 2020

Uh oh!

dims commented Oct 29, 2020

Uh oh!

thaJeztah commented Oct 29, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants