Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix files related to walkthrough of SPIRE101.md #940

Merged
merged 5 commits into from
Jun 3, 2019
Merged

Fix files related to walkthrough of SPIRE101.md #940

merged 5 commits into from
Jun 3, 2019

Conversation

ryysud
Copy link
Contributor

@ryysud ryysud commented Jun 1, 2019

Pull Request check list

  • Commit conforms to CONTRIBUTING.md?
  • Proper tests/regressions included?
  • Documentation updated?

Affected functionality

Nothing.

Description of change

I fixed files related to walkthrough of SPIRE101.md .

The changes are below.

  • Update path of volume mounted by docker
    • The WORKDIR of spire-dev container has changed from /root/go/src/github.com/spiffe/spire to /root/spire with 0b82eab .
  • Update old information of SPIRE101.md
    • I copied and pasted the current source code into spire-server.conf and spire-agent.conf .
  • Add files (Bundle and SVID) to .gitignore that will be created when doing the walkthrough
  • Fix some typos

Which issue this PR fixes

Nothing.

@ryysud
Fix files related to walkthrough of SPIRE101.md
fe41a92 
Signed-off-by: Ryuma Yoshida <ryuma.y1117@gmail.com>
@ryysud
Fix path of volume mounted by docker in ha-postgres's docker-compose.…
9b14909 
…yaml

Signed-off-by: Ryuma Yoshida <ryuma.y1117@gmail.com>
@ryysud
Copy link
Contributor Author

ryysud commented Jun 1, 2019 •
edited
Loading

I also found same incorrect config in docker-compose.yml used in HA PostgreSQL.
So, I fixed it with 9b14909 . Please comment if you prefer to create a another PR for this commit.

@evan2645
Copy link
Member

evan2645 commented Jun 3, 2019

Awesome, this is super helpful @ryysud thank you for sending this change.

Considering #940, should we update the country, organization, and common_name casing in the example here too?

@ryysud
fixup! Fix path of volume mounted by docker in ha-postgres's docker-c…
e03f492 
…ompose.yaml

Signed-off-by: Ryuma Yoshida <ryuma.y1117@gmail.com>
@ryysud
Copy link
Contributor Author

ryysud commented Jun 3, 2019

@evan2645 Yes. I fixed it with e03f492 .

@ryysud
Copy link
Contributor Author

ryysud commented Jun 3, 2019

I resolved the conflict.

evan2645
evan2645 approved these changes Jun 3, 2019
View reviewed changes
Copy link
Member

@evan2645 evan2645 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❤️

@evan2645 evan2645 merged commit 28aa2cd into spiffe:master Jun 3, 2019
@ryysud ryysud deleted the fix-SPIRE101 branch June 3, 2019 23:48
@ryysud
Copy link
Contributor Author

ryysud commented Jun 3, 2019

Thank you for your review!

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

@evan2645 evan2645 evan2645 approved these changes

@ajessup ajessup Awaiting requested review from ajessup

@amartinezfayo amartinezfayo Awaiting requested review from amartinezfayo

@azdagron azdagron Awaiting requested review from azdagron

@drrt drrt Awaiting requested review from drrt

@jennybeth jennybeth Awaiting requested review from jennybeth

@MarcosDY MarcosDY Awaiting requested review from MarcosDY

@martincapello martincapello Awaiting requested review from martincapello

@walmav walmav Awaiting requested review from walmav

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ryysud @evan2645