Skip to content

Conversation

@wking
Copy link
Contributor

@wking wking commented May 9, 2016

CONTRIBUTING.md and MAINTAINERS_GUIDE.md from #1 came out of
opencontainers/runc but lost their history. Since dropping history
like that makes Signed-off-by tags less useful, this PR restores the
history extracted from the runC repository. The branch was
constructed with:

$ git remote add --no-tags runc git://github.com/opencontainers/runc.git
$ git fetch runc
$ git checkout runc/master
$ git filter-branch -f --prune-empty --index-filter 'git rm --cached $(git ls-files | grep -v "^\(libcontainer/\|hack/\)\?\(CONTRIBUTING.md\|LICENSE\|MAINTAINERS_GUIDE.md\|CONTRIBUTORS.md\|CONTRIBUTORS_GUIDE.md\|MAINTAINERS.md\)$")'
$ COMMITS=$(git log --no-merges --oneline | grep -v 'Initial commit' | cut -f 1 -d ' ' | tac)
$ git checkout --orphan runc-history
$ git rm -rf .
$ for COMMIT in $COMMITS; do git cherry-pick $COMMIT; done
$ git rebase -i 'HEAD^{/Move libcontainer documenation to root of repo}^'
$ git checkout 'HEAD^{/Move libcontainer into subdirectory}^' -- LICENSE
$ git commit --amend --no-edit
$ git rebase --continue
$ diff <(git ls-tree runc/master) <(git ls-tree HEAD)
# no differences in the files we're pulling out
$ git merge origin/master
# resolve conflicts
$ git show --format=%T origin/master
72e1e27f32b0d90129fdbf31f1de471d90437347
$ git show --format=%T HEAD
72e1e27f32b0d90129fdbf31f1de471d90437347

Pulling in the LICENSE as well makes the Signed-off-by assertions
useful, even though that's (almost) the same content that already landed in
this repo via ad517c3.

Solomon Hykes and others added 22 commits May 9, 2016 11:06
Signed-off-by: Solomon Hykes <solomon@docker.com>
This was such a good resource in Docker that it would be a shame to
lose it. Unfortunately, we can't just link to the corresponding
information in the Docker project as a number of aspects are bound to
be different here.

Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
This is based on feedback from @rjnagal.

Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
These changes were suggested by @vmarmol.

Docker-DCO-1.1-Signed-off-by: Glyn Normington <gnormington@gopivotal.com> (github: glyn)
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Docker-DCO-1.1-Signed-off-by: Mrunal Patel <mrunalp@gmail.com> (github: mrunalp)
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This moves much of the documentation on contributing and maintainer the
codebase from the libcontainer sub directory to the root of the repo.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This makes some changes to the maintainer's guide and roles within the
project.  It removed the concept of a BDFL and carries over the chief
maintainer role into the project.  BDFL sucks and we can do better and
these changed help to make many more things specific around adding new
maintainers and removing them as well.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Resolving trivial "runC" -> "the project" and similar changes that
were made in the project-template version.

Also remove the Docker copyright notice from LICENSE to match the
project-template version.

Conflicts:
	CONTRIBUTING.md
	LICENSE
	MAINTAINERS_GUIDE.md
@caniszczyk
Copy link
Contributor

@crosbymichael any opinion here? I don't think we need the full history

@crosbymichael
Copy link
Member

Ya, not really a need here as we are already modifying it. Its nice to have a fresh and clean history for these docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants