docker-archive / deploykit

A toolkit for creating and managing declarative, self-healing infrastructure.
Apache License 2.0
2.25k stars 262 forks source link

Update README with updated CLI commands #785

Closed aimeeu closed 6 years ago

aimeeu commented 6 years ago

Replace outdated CLI commands in docs/tutorial/README.md

Signed-off-by: Aimee Ukasick aimeeu.opensource@gmail.com

codecov[bot] commented 6 years ago

Codecov Report

Merging #785 into master will not change coverage. The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #785   +/-   ##
=======================================
  Coverage   48.51%   48.51%           
=======================================
  Files          85       85           
  Lines        7505     7505           
=======================================
  Hits         3641     3641           
  Misses       3515     3515           
  Partials      349      349

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 9bfc5c4...6fe46cb. Read the comment docs.

GordonTheTurtle commented 6 years ago

Please sign your commits following these rules: https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work The easiest way to do this is to amend the last commit:

$ git clone -b "784/tutorialReadmeDocUpdate" git@github.com:aimeeu/infrakit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354607912
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

aimeeu commented 6 years ago

@GordonTheTurtle Sorry to be dense. I've only committed patches to OpenStack and OPNFV, which is a bit different. I read the pages referenced in the infrakit CONTRIBUTING page. Based on those, I forked the infrakit project using the github UI. Then:

$ git clone git@github.com:aimeeu/infrakit.git
$ git checkout -b 784/tutorialReadmeDocUpdate

I made changes to the README.md file.

$ git add docs/tutorial/README.md`
$ git commit
[784/tutorialReadmeDocUpdate 67e5418] Update README with updated CLI commands
 1 file changed, 13 insertions(+), 14 deletions(-)

I included Signed-off-by: Aimee Ukasick aimeeu.opensource@gmail.com in the commit message Then: $ git push --set-upstream origin 784/tutorialReadmeDocUpdate

Obviously I did something wrong if the commit wasn't properly signed off - the signature line is still in my local branch when I checked with 'git commit --amend'

I tried following your instructions, but

$ git rebase -i HEAD~842354607912
fatal: Needed a single revision
invalid upstream HEAD~842354607912

So at this point it's probably easier to just abandon this pull request and start over. Do you have any advice? Thanks in advance.

thebsdbox commented 6 years ago

You're actual commit is fine, it was the merge commit that doesn't have the signature.

I think it might be OK.